summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErkki Seppälä <erkki.seppala@vincit.fi>2011-01-18 15:58:20 +0200
committerErkki Seppälä <erkki.seppala@vincit.fi>2011-03-11 12:38:08 +0200
commit690f8bffd48a4e7e74298360ddd0431dc95dcd3f (patch)
treeb2f0aef057f4dfcf51b0f3bdaa93ce931b5a4de7
parent6a4d027284e7bb5dd458157947bbb1ff580ad071 (diff)
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>
-rw-r--r--src/xkb/XKBGAlloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xkb/XKBGAlloc.c b/src/xkb/XKBGAlloc.c
index 17d13be..90ec2f9 100644
--- a/src/xkb/XKBGAlloc.c
+++ b/src/xkb/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;