[svn:parrot] r41439 - trunk/src/pmc

[NotFound at svn.parrot.org]

Author: NotFound
Date: Wed Sep 23 23:26:07 2009
New Revision: 41439
URL: https://trac.parrot.org/parrot/changeset/41439

Log:
[pmc] check seg before dereferencig in Continuation set_pointer

Modified:
   trunk/src/pmc/continuation.pmc

Modified: trunk/src/pmc/continuation.pmc
==============================================================================
--- trunk/src/pmc/continuation.pmc	Wed Sep 23 21:56:19 2009	(r41438)
+++ trunk/src/pmc/continuation.pmc	Wed Sep 23 23:26:07 2009	(r41439)
@@ -187,12 +187,12 @@
         cc->address    = pos;
         cc->runloop_id = INTERP->current_runloop_id;
 
-        if ((pos >= cc->seg->base.data)
+        cc->current_results = (cc->seg
+            && (pos >= cc->seg->base.data)
             && (pos < (cc->seg->base.data + cc->seg->base.size)
-            && (*pos == PARROT_OP_get_results_pc)))
-            cc->current_results = pos;
-        else
-            cc->current_results = NULL;
+            && (*pos == PARROT_OP_get_results_pc))) ?
+                pos :
+                (opcode_t *)NULL;
     }
 
 /*