YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: check context manager deinit callback for NULL before calling it (#2222)

Browse Source 
The deinit_cb should be allowed to be NULL.

JerryScript-DCO-1.0-Signed-off-by: Martijn The martijn.the@intel.com
This commit is contained in:
Martijn Thé
2018-03-01 09:31:39 +01:00
committed by László Langó
parent ccc283289c
commit 26ee8f7137
4 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/api/jerry.c
+4 -1
View File
@@ -215,7 +215,10 @@ jerry_cleanup (void)
this_p = next_p)
{
next_p = this_p->next_p;
this_p->manager_p->deinit_cb (JERRY_CONTEXT_DATA_HEADER_USER_DATA (this_p));
if (this_p->manager_p->deinit_cb)
{
this_p->manager_p->deinit_cb (JERRY_CONTEXT_DATA_HEADER_USER_DATA (this_p));
}
jmem_heap_free_block (this_p, sizeof (jerry_context_data_header_t) + this_p->manager_p->bytes_needed);
}
jerry-core/include/jerryscript-core.h
+1 -1
View File
@@ -217,7 +217,7 @@ typedef bool (*jerry_object_property_foreach_t) (const jerry_value_t property_na
typedef struct
{
void (*init_cb) (void *); /**< callback responsible for initializing a context item, or NULL to zero out the memory */
void (*deinit_cb) (void *); /**< callback responsible for deinitializing a context item */
void (*deinit_cb) (void *); /**< callback responsible for deinitializing a context item, or NULL */
size_t bytes_needed; /**< number of bytes to allocate for this manager */
} jerry_context_data_manager_t;