summaryrefslogtreecommitdiff
path: root/keytypes.c
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2014-03-08 18:50:22 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2014-03-10 23:25:21 -0700
commit6c2d3b0891f7be6ef4895be75188aa1c6f530bfc (patch)
treebb78a9a3ed78b9e002ed4bd68628534c5ccd3bf6 /keytypes.c
parent50ebe95a32dc59b1de899ef08f72462055b04065 (diff)
Don't dereference the pointer whose allocation failed
Flagged by cppcheck 1.64: [app/xkbcomp/keycodes.c:264] -> [app/xkbcomp/keycodes.c:262]: (warning) Possible null pointer dereference: new - otherwise it is redundant to check it against null. [app/xkbcomp/keytypes.c:600] -> [app/xkbcomp/keytypes.c:597]: (warning) Possible null pointer dereference: old - otherwise it is redundant to check it against null. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'keytypes.c')
-rw-r--r--keytypes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/keytypes.c b/keytypes.c
index 375ca3e..103d860 100644
--- a/keytypes.c
+++ b/keytypes.c
@@ -597,7 +597,7 @@ AddPreserve(XkbDescPtr xkb,
if (!old)
{
WSGO1("Couldn't allocate preserve in %s\n", TypeTxt(type));
- ACTION1("Preserve[%s] lost\n", PreserveIndexTxt(type, xkb, old));
+ ACTION1("Preserve[%s] lost\n", PreserveIndexTxt(type, xkb, new));
return False;
}
*old = *new;