Index: generic/nsfInt.h
===================================================================
diff -u -r183cd0a9a3d2a37133ac51bb86952e1b522dbf6f -ra0faba200038c44cda56f3f421361563b4bd95d7
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 183cd0a9a3d2a37133ac51bb86952e1b522dbf6f)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision a0faba200038c44cda56f3f421361563b4bd95d7)
@@ -276,12 +276,14 @@
 
 #if !defined(NDEBUG)
 # if defined(PRE86)
-#  define ISOBJ(o) ((o) != NULL && (o) != (void*)0xdeadbeaf && ((o)->typePtr ? (o)->typePtr->name != NULL : 1) && (o)->length >= -1 && ((o)->length > 0 ? (o)->bytes!= NULL : 1) && (o)->refCount >= 0)
+#  define ISOBJ(o) ((o) != NULL && ISOBJ_(o))
+#  define ISOBJ_(o) ((o) != (void*)0xdeadbeaf && ((o)->typePtr ? (o)->typePtr->name != NULL : 1) && (o)->length >= -1 && ((o)->length > 0 ? (o)->bytes!= NULL : 1) && (o)->refCount >= 0)
 #  else
-#  define ISOBJ(o) ((o) != NULL && (o) != (void*)0xdeadbeaf && ((o)->typePtr ? (o)->typePtr->name != NULL : 1) && ((o)->bytes != NULL ? (o)->length >= 0 : 1) && (o)->refCount >= 0)
+#  define ISOBJ(o) ((o) != NULL && ISOBJ_(o))
+#  define ISOBJ_(o) ((o) != (void*)0xdeadbeaf && ((o)->typePtr ? (o)->typePtr->name != NULL : 1) && ((o)->bytes != NULL ? (o)->length >= 0 : 1) && (o)->refCount >= 0)
 # endif
 #else
-# define ISOBJ(o) ((o) != NULL)
+# define ISOBJ(o) ((o) != NULL && ISOBJ_(o))
 #endif
 
 #define NSF_ABBREV_MIN_CHARS 4