registry: Reject unsupported flags

Author: wismill

src/registry.c

@@ -492,6 +492,12 @@ log_level(const char *level) {
     return RXKB_LOG_LEVEL_ERROR;
 }
 
+enum {
+    RXKB_CONTEXT_FLAGS = RXKB_CONTEXT_NO_DEFAULT_INCLUDES
+                       | RXKB_CONTEXT_LOAD_EXOTIC_RULES
+                       | RXKB_CONTEXT_NO_SECURE_GETENV
+};
+
 struct rxkb_context *
 rxkb_context_new(enum rxkb_context_flags flags)
 {
@@ -512,6 +518,14 @@ rxkb_context_new(enum rxkb_context_flags flags)
     if (env)
         rxkb_context_set_log_level(ctx, log_level(env));
 
+    if (flags & ~(enum rxkb_context_flags) RXKB_CONTEXT_FLAGS) {
+        log_err(ctx, XKB_LOG_MESSAGE_NO_ID,
+                "%s: Invalid context flags: 0x%x\n", __func__,
+                (flags & ~(enum rxkb_context_flags) RXKB_CONTEXT_FLAGS));
+        free(ctx);
+        return NULL;
+    }
+
     list_init(&ctx->models);
     list_init(&ctx->layouts);
     list_init(&ctx->option_groups);

test/registry.c

@@ -1126,6 +1126,10 @@ main(void)
 {
     test_init();
 
+    /* Reject unsupported flags */
+    assert(!rxkb_context_new(-1));
+    assert(!rxkb_context_new(0xffff));
+
     test_xml_error_handler();
     test_no_include_paths();
     test_invalid_include();