summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/xkbcomp/compat.c3
-rw-r--r--src/xkbcomp/keycodes.c3
-rw-r--r--src/xkbcomp/symbols.c3
-rw-r--r--src/xkbcomp/types.c3
4 files changed, 12 insertions, 0 deletions
diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index 9b6f9de..44a444c 100644
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -430,6 +430,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 91471ea..0655447 100644
--- a/src/xkbcomp/keycodes.c
+++ b/src/xkbcomp/keycodes.c
@@ -339,6 +339,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 6d46884..58f73e6 100644
--- a/src/xkbcomp/symbols.c
+++ b/src/xkbcomp/symbols.c
@@ -569,6 +569,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 34e1028..fa12c23 100644
--- a/src/xkbcomp/types.c
+++ b/src/xkbcomp/types.c
@@ -212,6 +212,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;