From 3b3a1b8cdf7f734aca0a7b9eea0fac618d923595 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Mon, 8 Sep 2008 07:38:41 +0000
Subject: [PATCH] Merged r4082:4083 from branches/SDL-1.2: sparc64 crash fix.

---
 src/video/Xext/Xxf86vm/XF86VMode.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/video/Xext/Xxf86vm/XF86VMode.c b/src/video/Xext/Xxf86vm/XF86VMode.c
index 8fa2583ae..dc578f10b 100644
--- a/src/video/Xext/Xxf86vm/XF86VMode.c
+++ b/src/video/Xext/Xxf86vm/XF86VMode.c
@@ -210,6 +210,13 @@ SDL_NAME(XF86VidModeGetGamma) (Display * dpy, int screen,
     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;
@@ -285,7 +292,7 @@ SDL_NAME(XF86VidModeModeLine) * modeline;
         _XRead(dpy, (char *) modeline->private,
                modeline->privsize * sizeof(INT32));
     } else {
-        modeline->private = NULL;
+        zap_ptr((char *)&modeline->private, sizeof(modeline->private))
     }
     UnlockDisplay(dpy);
     SyncHandle();