Prevent crash from unaligned memory access on sparc64, etc. SDL-1.2
authorRyan C. Gordon <icculus@icculus.org>
Mon, 08 Sep 2008 07:33:05 +0000
branchSDL-1.2
changeset 4151 cab9823cb55e
parent 4150 1019eb074a56
child 4152 39b9405d3cb6
Prevent crash from unaligned memory access on sparc64, etc. Fixes Bugzilla #602. I suspect this will crash elsewhere if the system actually had modelines to report, though.
src/video/Xext/Xxf86vm/XF86VMode.c
--- a/src/video/Xext/Xxf86vm/XF86VMode.c	Thu Aug 07 20:55:45 2008 +0000
+++ b/src/video/Xext/Xxf86vm/XF86VMode.c	Mon Sep 08 07:33:05 2008 +0000
@@ -214,6 +214,12 @@
     return True;
 }
 
+/* this is to prevent an unaligned memory write on CPUs that need that. */
+static void zap_ptr(char *ptr, size_t size)
+{
+    memset(ptr, '\0', size);
+}
+
 Bool
 SDL_NAME(XF86VidModeGetModeLine)(dpy, screen, dotclock, modeline)
     Display* dpy;
@@ -284,7 +290,7 @@
 	}
 	_XRead(dpy, (char*)modeline->private, modeline->privsize * sizeof(INT32));
     } else {
-	modeline->private = NULL;
+	zap_ptr((char *)&modeline->private, sizeof(modeline->private))
     }
     UnlockDisplay(dpy);
     SyncHandle();