From 5d2082d1474951aea430f2a835333f77026aa5a1 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Wed, 7 Jan 2004 21:47:35 +0000 Subject: [PATCH] * approved by rth 2004-01-07 Dave Jones * malloc.c (GC_generic_malloc): Correct initialization typo. * mallocx.c (GC_generic_malloca_ignore_off_page): Ditto. From-SVN: r75518 --- boehm-gc/ChangeLog | 5 +++++ boehm-gc/malloc.c | 2 +- boehm-gc/mallocx.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 347a310d82c..354e11b6531 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,8 @@ +2004-01-07 Dave Jones + + * malloc.c (GC_generic_malloc): Correct initialization typo. + * mallocx.c (GC_generic_malloca_ignore_off_page): Ditto. + 2003-10-31 Richard Earnshaw * include/private/gcconfig.h: Re-install change of 2003-04-16. diff --git a/boehm-gc/malloc.c b/boehm-gc/malloc.c index f5c8f06b0dd..353a9bc9599 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 06f45622dfb..84993da2026 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); -- 2.30.2