diff options
| author | marha <marha@users.sourceforge.net> | 2014-06-26 09:35:54 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-06-26 09:35:54 +0200 |
| commit | d47db8d4713de42ccca071c9e8401fc7a213ed49 (patch) | |
| tree | 7189b3c025315c514ae9d2835810b94d0e4e0e01 /libX11/src/xkb/XKBAlloc.c | |
| parent | 880395e8c3f451bf34b96da76fcee133b356e966 (diff) | |
| parent | c30d5eefc96925b4bef781806c7a0114eca1b8e0 (diff) | |
| download | vcxsrv-d47db8d4713de42ccca071c9e8401fc7a213ed49.tar.gz vcxsrv-d47db8d4713de42ccca071c9e8401fc7a213ed49.tar.bz2 vcxsrv-d47db8d4713de42ccca071c9e8401fc7a213ed49.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Opdated to openssl-1.0.1h xkeyboard-config fontconfig libX11 libxcb xcb-proto mesa xserver git update 26 June 2014
Conflicts:
openssl/Makefile
Diffstat (limited to 'libX11/src/xkb/XKBAlloc.c')
| -rw-r--r-- | libX11/src/xkb/XKBAlloc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libX11/src/xkb/XKBAlloc.c b/libX11/src/xkb/XKBAlloc.c index 5cfef0fb8..50a5764d6 100644 --- a/libX11/src/xkb/XKBAlloc.c +++ b/libX11/src/xkb/XKBAlloc.c @@ -442,8 +442,7 @@ XkbAllocDeviceInfo(unsigned deviceSpec, unsigned nButtons, unsigned szLeds) devi->sz_leds = szLeds; devi->leds = _XkbTypedCalloc(szLeds, XkbDeviceLedInfoRec); if (!devi->leds) { - if (devi->btn_acts) - _XkbFree(devi->btn_acts); + _XkbFree(devi->btn_acts); _XkbFree(devi); return NULL; } |