From c43c12489ba93c91e0aa77b7fc35b2d68826e60d Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Mon, 8 Sep 2008 07:33:05 +0000
Subject: [PATCH] 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/video/Xext/Xxf86vm/XF86VMode.c b/src/video/Xext/Xxf86vm/XF86VMode.c
index 5cb21905a..4b933f26f 100644
--- a/src/video/Xext/Xxf86vm/XF86VMode.c
+++ b/src/video/Xext/Xxf86vm/XF86VMode.c
@@ -214,6 +214,12 @@ SDL_NAME(XF86VidModeGetGamma)(Display *dpy, int screen, SDL_NAME(XF86VidModeGamm
     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 @@ SDL_NAME(XF86VidModeGetModeLine)(dpy, screen, dotclock, 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();