diff options
| author | marha <marha@users.sourceforge.net> | 2014-06-08 15:05:49 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-06-08 15:05:49 +0200 |
| commit | 71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec (patch) | |
| tree | ea689cdd51f395980ddc37dc33781635976f3a16 /libX11/src/GetRGBCMap.c | |
| parent | aec798fb4dc72d616732d0fa711faffaa8cd7590 (diff) | |
| parent | 2acb86c9b086bdb9a3897db0b93820652e07cb59 (diff) | |
| download | vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.tar.gz vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.tar.bz2 vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
apps/xwininfo/xwininfo.c
xorg-server/hw/xwin/glx/indirect.c
Diffstat (limited to 'libX11/src/GetRGBCMap.c')
| -rw-r--r-- | libX11/src/GetRGBCMap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libX11/src/GetRGBCMap.c b/libX11/src/GetRGBCMap.c index d8a1b3f05..5d570ad3a 100644 --- a/libX11/src/GetRGBCMap.c +++ b/libX11/src/GetRGBCMap.c @@ -63,7 +63,7 @@ Status XGetRGBColormaps ( /* if wrong type or format, or too small for us, then punt */ if ((actual_type != XA_RGB_COLOR_MAP) || (actual_format != 32) || (nitems < OldNumPropStandardColormapElements)) { - if (data) Xfree (data); + Xfree (data); return False; } @@ -78,7 +78,7 @@ Status XGetRGBColormaps ( Screen *sp = _XScreenOfWindow (dpy, w); if (!sp) { - if (data) Xfree (data); + Xfree (data); return False; } def_visual = sp->root_visual->visualid; @@ -90,7 +90,7 @@ Status XGetRGBColormaps ( ncmaps = (nitems / NumPropStandardColormapElements); if ((((unsigned long) ncmaps) * NumPropStandardColormapElements) != nitems) { - if (data) Xfree (data); + Xfree (data); return False; } } @@ -101,7 +101,7 @@ Status XGetRGBColormaps ( */ cmaps = Xmalloc (ncmaps * sizeof (XStandardColormap)); if (!cmaps) { - if (data) Xfree (data); + Xfree (data); return False; } |