diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-03 11:20:18 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-03 11:20:18 +0000 |
| commit | 46fbac6f1b19416ee1dbca883f0d09d9fd75d1eb (patch) | |
| tree | 2ddc90cb6bc4f04db80d66a334ecaabf139c0176 /libX11/modules/im/ximcp/imRmAttr.c | |
| parent | 97f3d3043a79d6031787c246a67d2a02ff0a8d08 (diff) | |
| parent | 83a4fe0dc71aafbef11477b284abe530d3877556 (diff) | |
| download | vcxsrv-46fbac6f1b19416ee1dbca883f0d09d9fd75d1eb.tar.gz vcxsrv-46fbac6f1b19416ee1dbca883f0d09d9fd75d1eb.tar.bz2 vcxsrv-46fbac6f1b19416ee1dbca883f0d09d9fd75d1eb.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libX11/modules/im/ximcp/imRmAttr.c')
| -rw-r--r-- | libX11/modules/im/ximcp/imRmAttr.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libX11/modules/im/ximcp/imRmAttr.c b/libX11/modules/im/ximcp/imRmAttr.c index b6d1e1293..5035df514 100644 --- a/libX11/modules/im/ximcp/imRmAttr.c +++ b/libX11/modules/im/ximcp/imRmAttr.c @@ -313,7 +313,7 @@ _XimAttributeToValue( INT16 len = data[0]; char *base_name; XFontSet rep = (XFontSet)NULL; - char **missing_list; + char **missing_list = NULL; int missing_count; char *def_string; @@ -347,6 +347,7 @@ _XimAttributeToValue( } Xfree(base_name); + Xfree(missing_list); *((XFontSet *)value) = rep; break; } @@ -956,6 +957,7 @@ _XimEncodePreeditValue( &count, (Atom)p->value))) return False; + XFree(colormap_ret); } else if (res->xrm_name == XrmStringToQuark(XNFontSet)) { int list_ret; XFontStruct **struct_list; @@ -999,7 +1001,7 @@ _XimEncodeStatusValue( XIMArg *p) { if (res->xrm_name == XrmStringToQuark(XNStdColormap)) { - XStandardColormap *colormap_ret; + XStandardColormap *colormap_ret = NULL; int count; if (!(XGetRGBColormaps(ic->core.im->core.display, @@ -1007,6 +1009,7 @@ _XimEncodeStatusValue( &count, (Atom)p->value))) return False; + XFree(colormap_ret); } else if (res->xrm_name == XrmStringToQuark(XNFontSet)) { int list_ret; XFontStruct **struct_list; |