[X2Go-Commits] [nx-libs] 90/108: Keyboard.c: guard XkbFreeKeyboard calls

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit d8bbbcf29c3c0e43ce28d76e52e6a8ad9deeb90f
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Mon Jul 16 22:23:05 2018 +0200

    Keyboard.c: guard XkbFreeKeyboard calls
    
    manpage does not tell us if NULL is valid
---
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 65c4d20..84121c1 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -723,8 +723,11 @@ XkbError:
         fprintf(stderr, "nxagentKeyboardProc: XKB error.\n");
         #endif
 
-        XkbFreeKeyboard(xkb, XkbAllComponentsMask, True);
-        xkb = NULL;
+        if (xkb)
+        {
+            XkbFreeKeyboard(xkb, XkbAllComponentsMask, True);
+            xkb = NULL;
+        }
 
         free(model);
         free(layout);
@@ -874,14 +877,16 @@ XkbError:
           goto XkbError;
         }
 
-XkbEnd:
         if (nxagentOption(Shadow) == 1 && pDev && pDev->key)
         {
           NXShadowInitKeymap(&(pDev->key->curKeySyms));
         }
 
-        XkbFreeKeyboard(xkb, XkbAllComponentsMask, True);
-        xkb = NULL;
+        if (xkb)
+        {
+            XkbFreeKeyboard(xkb, XkbAllComponentsMask, True);
+            xkb = NULL;
+        }
 
         free(model);
         free(layout);

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git