From 72ceaa9acfbcd31c7cb38f4d7163359b54ac2150 Mon Sep 17 00:00:00 2001
From: David Reveman <davidr@novell.com>
Date: Wed, 16 Jul 2008 14:49:33 -0400
Subject: [PATCH] Set property data to 0 when translation failed to avoid
 having the data accidentally reference some other existing resource.

---
 hw/dmx/dmxwindow.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/hw/dmx/dmxwindow.c b/hw/dmx/dmxwindow.c
index 40269c32d..1585f95f0 100644
--- a/hw/dmx/dmxwindow.c
+++ b/hw/dmx/dmxwindow.c
@@ -1233,7 +1233,7 @@ dmxTranslateWindowProperty (WindowPtr     pWindow,
 	if (name)
 	    *dst = XInternAtom (dmxScreen->beDisplay, name, FALSE);
 	else
-	    *dst = *src;
+	    *dst = 0;
     } break;
     case 'p':
     case 'P': {
@@ -1263,7 +1263,7 @@ dmxTranslateWindowProperty (WindowPtr     pWindow,
 			       DixReadAccess) == Success)
 	    *dst = (DMX_GET_PIXMAP_PRIV (pPixmap))->pixmap;
 	else
-	    *dst = *src;
+	    *dst = 0;
     } break;
     case 'm':
     case 'M': {
@@ -1293,7 +1293,7 @@ dmxTranslateWindowProperty (WindowPtr     pWindow,
 			       DixReadAccess) == Success)
 	    *dst = (DMX_GET_COLORMAP_PRIV (pColormap))->cmap;
 	else
-	    *dst = *src;
+	    *dst = 0;
     } break;
     case 'c':
     case 'C': {
@@ -1308,7 +1308,7 @@ dmxTranslateWindowProperty (WindowPtr     pWindow,
 			       DixReadAccess) == Success)
 	    *dst = (DMX_GET_CURSOR_PRIV (pCursor, pScreen))->cursor;
 	else
-	    *dst = *src;
+	    *dst = 0;
     } break;
     case 'd':
     case 'D': {
@@ -1351,7 +1351,7 @@ dmxTranslateWindowProperty (WindowPtr     pWindow,
 	    }
 	}
 	else
-	    *dst = *src;
+	    *dst = 0;
     } break;
     case 'f':
     case 'F': {
@@ -1371,7 +1371,7 @@ dmxTranslateWindowProperty (WindowPtr     pWindow,
 	    *dst = pFontPriv->font[pScreen->myNum]->fid;
 	}
 	else
-	    *dst = *src;
+	    *dst = 0;
     } break;
     case 'v':
     case 'V': {
@@ -1383,7 +1383,7 @@ dmxTranslateWindowProperty (WindowPtr     pWindow,
 	if (visual)
 	    *dst = XVisualIDFromVisual (visual);
 	else
-	    *dst = *src;
+	    *dst = 0;
     } break;
     case 'w':
     case 'W': {
@@ -1413,7 +1413,7 @@ dmxTranslateWindowProperty (WindowPtr     pWindow,
 			       DixReadAccess) == Success)
 	    *dst = (DMX_GET_WINDOW_PRIV (pWin))->window;
 	else
-	    *dst = *src;
+	    *dst = 0;
     } break;
     default:
 	*((CARD32 *) output) = *((CARD32 *) data);