From: Camm Maguire <camm@debian.org>
Date: Wed, 18 Dec 2019 20:14:09 +0000 (+0000)
Subject: Version_2_6_13pre82
X-Git-Tag: archive/raspbian/2.6.12-91+rpi1^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ba2d4a7524e3d7923f7a4f5a081e6323663ac4ba;p=gcl.git

Version_2_6_13pre82


Gbp-Pq: Name Version_2_6_13pre82
---

diff --git a/o/alloc.c b/o/alloc.c
index f8470e67..0343ab74 100644
--- a/o/alloc.c
+++ b/o/alloc.c
@@ -349,9 +349,10 @@ resize_hole(ufixnum hp,enum type tp,bool in_placep) {
   char *start=rb_begin(),*new_start=heap_end+hp*PAGESIZE;
   ufixnum size=rb_pointer-start;
 
+#define OVERLAP(c_,t_,s_) ((t_)<(c_)+(s_) && (c_)<(t_)+(s_))
   if (!in_placep && (rb_high() ?
-		     new_start+size>rb_end :
-		     new_start+(nrbpage<<PAGEWIDTH)<start+size
+		     OVERLAP(start,new_start,size) :
+		     OVERLAP(start,new_start+(nrbpage<<PAGEWIDTH),size)
 		     /* 0 (20190401  never reached)*/
 		     )) {
     if (sSAnotify_gbcA->s.s_dbind != Cnil)