Changeset 31 for trunk/orca/ovalue.c

Timestamp:

02/08/06 01:35:49 (3 years ago)

Author:

krobillard

Message:

Overflow of the quick hold stack is now caught.

Files:

• trunk/orca/ovalue.c (modified) (7 diffs)

trunk/orca/ovalue.c

@@ -304 +304 @@
     env->secure    = 0;
 
-    // TODO: Do something about quickHolds stack overflow. Just use orHold()?
-    env->quickHolds    = memAlloc( sizeof(OHold) * 256 );
-    env->quickHoldsTop = env->quickHolds;
+    env->quickHolds     = memAlloc( sizeof(OHold) * OR_MAX_QHOLDS );
+    env->quickHoldsUsed = 0;
 
     // NOTE: The data & call stacks are never resized so that it is safe
@@ -535 +534 @@
     env->callStack.used = 0;
     env->dataStack.used = 0;
-    env->quickHoldsTop = env->quickHolds;
+    env->quickHoldsUsed = 0;
     env->error = 0;      //orErrorClear;
 }
@@ -1340 +1339 @@
         OValue fileVal = *a1;
 
+        orRefAvailErr( 2 );
         orRefPush( OT_FILE, a1->index );
         // Need to ref args?
@@ -1648 +1648 @@
     OIndex bi   = (a1 + 1)->series.it;
 
+    orRefAvailErr( 2 )
     orRefPush( OT_BLOCK, cond );
     orRefPush( OT_BLOCK, body );
@@ -2887 +2888 @@
         int vi;
 
+        orRefAvailErr( 3 )
         orRefPush( OT_BLOCK, a1->index );
         rblk = orMakeBlock(0);
@@ -3053 +3055 @@
     int reti;
 
+    /* Check if 2 are free because there is an orRefPush in orEval()
+       and we can save a check there by doing it here.
+       This is the only check which will catch an endlessly recursive does.
+     */
+    orRefAvailErr( 2 )
     orRefPush( OT_BLOCK, blkN );
 
@@ -4239 +4246 @@
 
 
+    orRefAvailErr( 4 )
     orRefPush( OT_BLOCK, a1->index );
     orRefPush( OT_BLOCK, a2->index );