From c30d5eefc96925b4bef781806c7a0114eca1b8e0 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 26 Jun 2014 09:30:29 +0200
Subject: Opdated to openssl-1.0.1h xkeyboard-config fontconfig libX11 libxcb
 xcb-proto mesa xserver git update 26 June 2014

xserver          commit a3b44ad8db1fa2f3b81c1ff9498f31c5323edd37
libxcb           commit 125135452a554e89e49448e2c1ee6658324e1095
libxcb/xcb-proto commit 84bfd909bc3774a459b11614cfebeaa584a1eb38
xkeyboard-config commit 39a226707b133ab5540c2d30176cb3857e74dcca
libX11           commit a4679baaa18142576d42d423afe816447f08336c
fontconfig       commit 274f2181f294af2eff3e8db106ec8d7bab2d3ff1
mesa             commit 9a8acafa47558cafeb37f80f4b30061ac1962c69
---
 libX11/src/xkb/XKBGeom.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'libX11/src/xkb/XKBGeom.c')

diff --git a/libX11/src/xkb/XKBGeom.c b/libX11/src/xkb/XKBGeom.c
index feaaab6f8..66dca9ee0 100644
--- a/libX11/src/xkb/XKBGeom.c
+++ b/libX11/src/xkb/XKBGeom.c
@@ -269,10 +269,9 @@ _XkbReadGeomProperties(XkbReadBufferPtr buf,
             ok = _XkbGetReadBufferCountedString(buf, &name) && ok;
             ok = _XkbGetReadBufferCountedString(buf, &value) && ok;
             ok = ok && (XkbAddGeomProperty(geom, name, value) != NULL);
-            if (name)
-                _XkbFree(name);
-            if (value)
-                _XkbFree(value);
+
+	    _XkbFree(name);
+	    _XkbFree(value);
         }
         if (ok)
             rtrn = Success;
@@ -322,8 +321,8 @@ _XkbReadGeomColors(XkbReadBufferPtr buf,
                 rtrn = BadLength;
             else if (XkbAddGeomColor(geom, spec, geom->num_colors) == NULL)
                 rtrn = BadAlloc;
-            if (spec)
-                _XkbFree(spec);
+
+            _XkbFree(spec);
             if (rtrn != Success)
                 return rtrn;
         }
-- 
cgit v1.2.3