xkb: XkbPropertyPtr determined allocation success from wrong variables

Cannot reach dead statement "return NULL;" Check for the NULLness of prop->name and prop->value instead of name and value, which was checked earlier anyway. Decided against using strdup due to curious memory allocation functions and the rest of the xkb not using it either. Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi> Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

xkb: XkbPropertyPtr determined allocation success from wrong variables
29ad23b9 · Erkki Seppälä · Ulrich Sibiller · bbeee4fd · 29ad23b9
Commit 29ad23b9 authored Jan 18, 2011 by Erkki Seppälä Committed by Ulrich Sibiller Oct 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

XKBGAlloc.c nx-X11/lib/X11/XKBGAlloc.c +2 -2

No files found.
--- a/nx-X11/lib/X11/XKBGAlloc.c
+++ b/nx-X11/lib/X11/XKBGAlloc.c
@@ -696,11 +696,11 @@ register XkbPropertyPtr prop;
    }
    prop= &geom->properties[geom->num_properties];
    prop->name= (char *)_XkbAlloc(strlen(name)+1);
-    if (!name)
+    if (!prop->name)
 	return NULL;
    strcpy(prop->name,name);
    prop->value= (char *)_XkbAlloc(strlen(value)+1);
-    if (!value) {
+    if (!prop->value) {
 	_XkbFree(prop->name);
 	prop->name= NULL;
 	return NULL;