Merge branch 'master' of https://github.com/larcenists/larceny

larcenists · Jul 3, 2017 · 8728705 · 8728705
2 parents 8309025 + bb350e5
commit 8728705
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/Rts/Fence/fence-millicode.c b/src/Rts/Fence/fence-millicode.c
@@ -131,6 +131,9 @@ void EXPORT mc_alloc( word *globals )
   assert2( is_fixnum(globals[G_RESULT]) && (int)globals[G_RESULT] >= 0 );
 
   nwords = roundup_walign( nwords );
+  if ( nwords*sizeof(word) > LARGEST_OBJECT )
+    signal_exception( globals, EX_ALLOC, 0, 0 );
+
   p = GC_malloc( nwords*sizeof(word) );
   assert (p != 0);
   globals[ G_RESULT ] = (word)p;
@@ -145,6 +148,9 @@ void EXPORT mc_alloc( word *globals )
   assert2(((word)elim & 7) == 0);
 
   nwords = roundup_walign( nwords );
+  if ( nwords*sizeof(word) > LARGEST_OBJECT )
+    signal_exception( globals, EX_ALLOC, 0, 0 );
+
   p = etop;
   etop += nwords;
   if (etop <= elim) {

diff --git a/src/Rts/Standard-C/millicode.c b/src/Rts/Standard-C/millicode.c
@@ -353,6 +353,9 @@ void EXPORT mc_alloc( word *globals )
   assert2( is_fixnum(globals[G_RESULT]) && (int)globals[G_RESULT] >= 0 );
 
   nwords = roundup_walign( nwords );
+  if ( nwords*sizeof(word) > LARGEST_OBJECT )
+    signal_exception( globals, EX_ALLOC, 0, 0 );
+
   p = GC_malloc( nwords*sizeof(word) );
   assert (p != 0);
   globals[ G_RESULT ] = (word)p;
@@ -367,6 +370,9 @@ void EXPORT mc_alloc( word *globals )
   assert2(((word)elim & 7) == 0);
 
   nwords = roundup_walign( nwords );
+  if ( nwords*sizeof(word) > LARGEST_OBJECT )
+    signal_exception( globals, EX_ALLOC, 0, 0 );
+
   p = etop;
   etop += nwords;
   if (etop <= elim) {