libX11/XKBNames.c fix: dereferenced before check

* Do not use variables before checked for NULL. Signed-off-by: Harms <wharms@bfs,de> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

libX11/XKBNames.c fix: dereferenced before check
861fe5ae · walter harms · Ulrich Sibiller · e7528f58 · 861fe5ae
Commit 861fe5ae authored Jun 04, 2014 by walter harms Committed by Ulrich Sibiller Oct 19, 2016
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

XKBNames.c nx-X11/lib/X11/XKBNames.c +6 -1

No files found.
--- a/nx-X11/lib/X11/XKBNames.c
+++ b/nx-X11/lib/X11/XKBNames.c
@@ -778,9 +778,14 @@ XkbNoteNameChanges(XkbNameChangesPtr old,
 {
    int first, last, old_last, new_last;

+    if ((old == NULL) || (new == NULL))
+        return;
+
    wanted &= new->changed;
-    if ((old == NULL) || (new == NULL) || (wanted == 0))
+
+    if (wanted == 0)
 	return;
+
    if (wanted & XkbKeyTypeNamesMask) {
        if (old->changed & XkbKeyTypeNamesMask) {
            new_last = (new->first_type + new->num_types - 1);