diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 347a310d82c4b2f0ff61324bf2e8debb4ecf07a9..354e11b65310b36f06bac0e79ef1d2c51b8e1215 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,8 @@ +2004-01-07 Dave Jones <davej@redhat.com> + + * malloc.c (GC_generic_malloc): Correct initialization typo. + * mallocx.c (GC_generic_malloca_ignore_off_page): Ditto. + 2003-10-31 Richard Earnshaw <rearnsha@arm.com> * include/private/gcconfig.h: Re-install change of 2003-04-16. diff --git a/boehm-gc/malloc.c b/boehm-gc/malloc.c index f5c8f06b0dd94267bb1766d83980c1a7a8232644..353a9bc9599ece171858f9eae30b6a1cd6324531 100644 --- a/boehm-gc/malloc.c +++ b/boehm-gc/malloc.c @@ -217,7 +217,7 @@ register int k; GC_words_allocd += lw; UNLOCK(); ENABLE_SIGNALS(); - if (init & !GC_debugging_started && 0 != result) { + if (init && !GC_debugging_started && 0 != result) { BZERO(result, n_blocks * HBLKSIZE); } } diff --git a/boehm-gc/mallocx.c b/boehm-gc/mallocx.c index 06f45622dfbedad71217293861145ab58d6ea483..84993da2026a3545aba438af524c6ceb1482e0c1 100644 --- a/boehm-gc/mallocx.c +++ b/boehm-gc/mallocx.c @@ -202,7 +202,7 @@ register int k; if (0 == result) { return((*GC_oom_fn)(lb)); } else { - if (init & !GC_debugging_started) { + if (init && !GC_debugging_started) { BZERO(result, n_blocks * HBLKSIZE); } return(result);