From ffe92c3e77cc29f543f6a54a6213c7f9191571f9 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Sun, 14 Jan 2018 10:51:06 +0300 Subject: [PATCH] Fix last_reclaimed..gc_no interval comparison to threshold in unmap_old (fix commit 14c324f8b) * allchblk.c [USE_MUNMAP] (GC_unmap_old): Replace (unsigned short)GC_gc_no-hb_last_reclaimed to (unsigned short)(GC_gc_no-hb_last_reclaimed) to handle value wrapping in hb_last_reclaimed (and the truncated GC_gc_no) correctly. --- allchblk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/allchblk.c b/allchblk.c index fc83b13..c8d03b1 100644 --- a/allchblk.c +++ b/allchblk.c @@ -409,7 +409,9 @@ GC_INNER void GC_unmap_old(void) hhdr = HDR(h); if (!IS_MAPPED(hhdr)) continue; - if ((unsigned short)GC_gc_no - hhdr -> hb_last_reclaimed > + /* Check that the interval is larger than the threshold (the */ + /* truncated counter value wrapping is handled correctly). */ + if ((unsigned short)(GC_gc_no - hhdr->hb_last_reclaimed) > (unsigned short)GC_unmap_threshold) { GC_unmap((ptr_t)h, hhdr -> hb_sz); hhdr -> hb_flags |= WAS_UNMAPPED; -- 2.7.4