Fix NULL after deref issue detected by static analysis tool

Change-Id: Ib63eaf8969c1fb75e02683908b276d2fc1d13705
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index b8922c9..f456a40 100644 (file)
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -428,6 +428,9 @@ HandleIncludeCompatMap(CompatInfo *info, IncludeStmt *include)
 {
     CompatInfo included;
 
+    if (!include)
+        return false;
+
     InitCompatInfo(&included, info->ctx, info->actions, &info->mods);
     included.name = include->stmt;
     include->stmt = NULL;

diff --git a/src/xkbcomp/keycodes.c b/src/xkbcomp/keycodes.c
index b8abf36..6436e8e 100644 (file)
--- a/src/xkbcomp/keycodes.c
+++ b/src/xkbcomp/keycodes.c
@@ -336,6 +336,9 @@ HandleIncludeKeycodes(KeyNamesInfo *info, IncludeStmt *include)
 {
     KeyNamesInfo included;
 
+    if (!include)
+        return false;
+
     InitKeyNamesInfo(&included, info->ctx);
     included.name = include->stmt;
     include->stmt = NULL;

diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c
index c2cd6e0..70d3198 100644 (file)
--- a/src/xkbcomp/symbols.c
+++ b/src/xkbcomp/symbols.c
@@ -556,6 +556,9 @@ HandleIncludeSymbols(SymbolsInfo *info, IncludeStmt *include)
 {
     SymbolsInfo included;
 
+    if (!include)
+        return false;
+
     InitSymbolsInfo(&included, info->keymap, info->actions, &info->mods);
     included.name = include->stmt;
     include->stmt = NULL;

diff --git a/src/xkbcomp/types.c b/src/xkbcomp/types.c
index 3feaf41..88034f0 100644 (file)
--- a/src/xkbcomp/types.c
+++ b/src/xkbcomp/types.c
@@ -210,6 +210,9 @@ HandleIncludeKeyTypes(KeyTypesInfo *info, IncludeStmt *include)
 {
     KeyTypesInfo included;
 
+    if (!include)
+        return false;
+
     InitKeyTypesInfo(&included, info->ctx, &info->mods);
     included.name = include->stmt;
     include->stmt = NULL;