[PATCH xts 1/2] Fix pointer/int warnings in xts5/xim/response.c

Peter Harris pharris at opentext.com
Thu May 30 15:46:33 PDT 2013


psd->data.bitmap is never set, but it's better to make sure we never
try to free() an XID.

Signed-off-by: Peter Harris <pharris at opentext.com>
---
 xts5/src/xim/response.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xts5/src/xim/response.c b/xts5/src/xim/response.c
index b00ccdd..c554acb 100644
--- a/xts5/src/xim/response.c
+++ b/xts5/src/xim/response.c
@@ -455,8 +455,8 @@ void xim_response_pop_cb(pstk)
 				}
 				else
 				{
-					if(psd->data.bitmap != NULL)
-						free(psd->data.bitmap);
+					if(psd->data.bitmap != None)
+						XFreePixmap(Dsp, psd->data.bitmap);
 				}
 				break;
 			default:
@@ -1133,7 +1133,7 @@ static Pixmap read_pixmap()
 		parse_skwhite(&presponse);
 	}
 
-	return(NULL);
+	return(None);
 }
 
 /* read the callback data from a response file for */
-- 
1.7.10.4



More information about the xorg-devel mailing list