From: bdemsky <bdemsky>
Date: Wed, 20 Aug 2008 00:44:46 +0000 (+0000)
Subject: should fix the bug...surprised that didn't show up earlier...
X-Git-Tag: buildscript^6~98
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=fba5a46d92969dd906f22e0a04d3b507b7f42710;p=IRC.git

should fix the bug...surprised that didn't show up earlier...
---

diff --git a/Robust/src/Runtime/DSTM/interface/dstm.h b/Robust/src/Runtime/DSTM/interface/dstm.h
index 7724cf3e..df1b024c 100644
--- a/Robust/src/Runtime/DSTM/interface/dstm.h
+++ b/Robust/src/Runtime/DSTM/interface/dstm.h
@@ -105,7 +105,7 @@ typedef struct objheader {
   (*((unsigned int *)&((struct ___Object___ *)((unsigned int) x + sizeof(objheader_t)))->___nextobject___))
 
 #define COMPOID(x) \
-  (*((unsigned int *)&((struct ___Object___ *) x)->___nextobject___))
+  ((void *x)!=NULL)?(*((unsigned int *)&((struct ___Object___ *) x)->___nextobject___)):0
 
 #define STATUS(x) \
   *((unsigned int *) &(((struct ___Object___ *)((unsigned int) x + sizeof(objheader_t)))->___localcopy___))