summaryrefslogtreecommitdiff
path: root/malloc.c
diff options
context:
space:
mode:
authorivmai <ivmai>2011-06-30 17:43:44 +0200
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 19:07:00 +0200
commitcea7d64af0f72989c690b0b0b8655a5f2d7ab2ad (patch)
tree0503f942088470083b0a292980ce05f8a35d860f /malloc.c
parent45a388771686fd791fc753fa877fc794b04d3c32 (diff)
2011-06-30 Ivan Maidanski <ivmai@mail.ru>
* dyn_load.c (GC_register_map_entries): Remove "count" local variable as unused. * gc_dlopen.c (disable_gc_for_dlopen): Define only if not USE_PROC_FOR_LIBRARIES. * malloc.c (calloc): Add parentheses around '&&' operator. * mark.c (GC_noop_sink): New global variable (instead of a static local variable inside GC_noop1). * mark.c (GC_noop1): Use GC_noop_sink variable (to prevent "variable set but not used" compiler warning). * include/private/gcconfig.h (USE_PROC_FOR_LIBRARIES): Define only if undefined yet. * tests/smash_test.c (main): Don't dereference "p" local variable if it is NULL. * tests/staticrootslib.c (main): Ditto.
Diffstat (limited to 'malloc.c')
-rw-r--r--malloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/malloc.c b/malloc.c
index d01f1e7..80ef18d 100644
--- a/malloc.c
+++ b/malloc.c
@@ -382,7 +382,7 @@ void * calloc(size_t n, size_t lb)
GC_init_lib_bounds();
lib_bounds_set = TRUE;
}
- if (caller >= GC_libpthread_start && caller < GC_libpthread_end
+ if ((caller >= GC_libpthread_start && caller < GC_libpthread_end)
|| (caller >= GC_libld_start && caller < GC_libld_end))
return GC_malloc_uncollectable(n*lb);
/* The two ranges are actually usually adjacent, so there may */