diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2014-03-08 18:46:11 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2014-03-10 23:24:43 -0700 |
| commit | 50ebe95a32dc59b1de899ef08f72462055b04065 (patch) | |
| tree | 8e9f7cd76e1ef55a7c89ed732ab4ae93decfc259 /parseutils.c | |
| parent | 31b90ee4ffc774e0da540277907fc5540c0b012c (diff) | |
| download | xorg-app-xkbcomp-50ebe95a32dc59b1de899ef08f72462055b04065.tar.gz | |
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 <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'parseutils.c')
| -rw-r--r-- | parseutils.c | 6 |
1 files changed, 2 insertions, 4 deletions
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; } |