From 50ebe95a32dc59b1de899ef08f72462055b04065 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 8 Mar 2014 18:46:11 -0800 Subject: Remove useless checks for NULL before free in OverlayKeyCreate() There is no need to ensure the pointers passed to free are not NULL, especially right after passing them to strncpy without checking for NULL. Flagged by cppcheck 1.64: [app/xkbcomp/parseutils.c:557] -> [app/xkbcomp/parseutils.c:559]: (warning) Possible null pointer dereference: over - otherwise it is redundant to check it against null. [app/xkbcomp/parseutils.c:558] -> [app/xkbcomp/parseutils.c:561]: (warning) Possible null pointer dereference: under - otherwise it is redundant to check it against null. Signed-off-by: Alan Coopersmith Reviewed-by: Peter Hutterer Reviewed-by: Daniel Stone --- parseutils.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'parseutils.c') diff --git a/parseutils.c b/parseutils.c index a1b6e9e..c08353d 100644 --- a/parseutils.c +++ b/parseutils.c @@ -556,10 +556,8 @@ OverlayKeyCreate(char *under, char *over) key->common.stmtType = StmtOverlayKeyDef; strncpy(key->over, over, XkbKeyNameLength); strncpy(key->under, under, XkbKeyNameLength); - if (over) - uFree(over); - if (under) - uFree(under); + uFree(over); + uFree(under); } return key; } -- cgit v1.2.3