encounter/bdwgc
0
0
Fork 0
mirror of https://github.com/encounter/bdwgc.git synced 2026-03-30 10:57:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential null dereference in GC_CONS

Browse Source 
* include/gc_inline.h (GC_CONS): Remove granules local variable; replace
GC_FAST_MALLOC_GRANS(GC_malloc_kind) to GC_MALLOC_WORDS_KIND(n=2);
store second element only if result is non-null; store first element
along with second one.
This commit is contained in:
Ivan Maidanski
2018-05-08 00:47:48 +03:00
parent 15a1f641c2
commit 0ff8f033cc
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/gc_inline.h
+5 -6
View File
@@ -185,12 +185,11 @@ GC_API GC_ATTR_MALLOC GC_ATTR_ALLOC_SIZE(1) void * GC_CALL
/* And once more for two word initialized objects: */
# define GC_CONS(result, first, second, tiny_fl) \
do { \
size_t granules = GC_WORDS_TO_WHOLE_GRANULES(2); \
GC_FAST_MALLOC_GRANS(result, granules, tiny_fl, 0, GC_I_NORMAL, \
GC_malloc_kind(granules * GC_GRANULE_BYTES, \
GC_I_NORMAL), \
*(void **)(result) = (void *)(first)); \
((void **)(result))[1] = (void *)(second); \
GC_MALLOC_WORDS_KIND(result, 2, tiny_fl, GC_I_NORMAL, (void)0); \
if ((result) != NULL) { \
*(void **)(result) = (void *)(first); \
((void **)(result))[1] = (void *)(second); \
} \
} while (0)
GC_API void GC_CALL GC_print_free_list(int /* kind */,