From f1b8f80ce9f8df1a7c0a3a02f754cc2ee420e12d Mon Sep 17 00:00:00 2001
From: matthieu <matthieu@openbsd.org>
Date: Mon, 6 Aug 2007 16:15:08 +0000
Subject: [PATCH] Pull patch from X.Org bugzilla #7364 from XF4 tree: fix for
 potential unaligned access on 64 bit architectures.

---
 xserver/render/render.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xserver/render/render.c b/xserver/render/render.c
index c5d681d30..6eb008c5f 100644
--- a/xserver/render/render.c
+++ b/xserver/render/render.c
@@ -1344,7 +1344,7 @@ ProcRenderCompositeGlyphs (ClientPtr client)
 	{
 	    if (buffer + sizeof (GlyphSet) < end)
 	    {
-                memcpy(&gs, buffer, sizeof(GlyphSet));
+		gs = *(CARD32 *) buffer;
 		glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client,
 								 gs,
 								 GlyphSetType,