[Bug 15090] Better definition of nil fixes crashes in 64-bit iOS

livecodepanos · livecodepanos · commit a7c04e02add6 · 2015-03-31T10:15:38.000+01:00
diff --git a/engine/src/mbliphonegfx.mm b/engine/src/mbliphonegfx.mm
@@ -608,9 +608,8 @@ - (id)initWithFrame:(CGRect)p_frame
 	t_layer = (CAEAGLLayer *)[self layer];
 	
 	[t_layer setOpaque: YES];
-    // PM-2015-03-30: [[ Bug 15090 ]] Cast the last nil sentinel to prevent crash when setting the acceletaredRendering to true on openCard/openStack handler. The crash occured only in 64 bit iOS devices 
 	[t_layer setDrawableProperties:
-				[NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithBool:FALSE], kEAGLDrawablePropertyRetainedBacking, kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat, (NSString*)nil]];
+				[NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithBool:FALSE], kEAGLDrawablePropertyRetainedBacking, kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat, nil]];
 	
 	// Initialize the context
 	
diff --git a/engine/src/typedefs.h b/engine/src/typedefs.h
@@ -182,13 +182,46 @@ typedef uint32_t codepoint_t;
 #endif
 
 // Null pointer defines (nil is preferred)
-
+// PM-2015-03-31: [[ Bug 15090 ]] Better definition of nil/NULL fixes crashes in 64 bit iOS
 #ifndef NULL
-#define NULL 0
+
+#if defined(__cplusplus) /* C++ */
+#	if defined(__GCC__)
+#		define NULL __null
+#	else
+#		define NULL uintptr_t(0)
+#	endif
+
+#else /* C */
+#	if defined(__GCC__)
+#		define NULL __null
+#	else
+#		define NULL ((void*)0)
+#	endif
+
+#endif
+
+
 #endif
 
 #ifndef nil
-#define nil 0
+
+#if defined(__cplusplus) /* C++ */
+#	if defined(__GCC__)
+#		define nil __null
+#	else
+#		define nil uintptr_t(0)
+#	endif
+
+#else /* C */
+#	if defined(__GCC__)
+#		define nil __null
+#	else
+#		define nil ((void*)0)
+#	endif
+
+#endif
+
 #endif
 
 // Boolean definitions
diff --git a/libcore/include/core.h b/libcore/include/core.h
@@ -108,8 +108,26 @@ typedef const struct __CFString * CFStringRef;
 typedef const struct __CFData * CFDataRef;
 #endif
 
+// PM-2015-03-31: [[ Bug 15090 ]] Better definition of nil fixes crashes in 64 bit iOS
 #ifndef nil
-#define nil 0
+
+#if defined(__cplusplus) /* C++ */
+#	if defined(__GCC__)
+#		define nil __null
+#	else
+#		define nil uintptr_t(0)
+#	endif
+
+#else /* C */
+#	if defined(__GCC__)
+#		define nil __null
+#	else
+#		define nil ((void*)0)
+#	endif
+
+#endif
+
+
 #endif
 
 #if defined(_MACOSX) && defined(__LP64__)
