From caa126e03c5d8ebaeae0e0f50e1e8dd9903a2c9f Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Sat, 29 Jan 2022 12:23:44 -0600
Subject: [PATCH] probably the best approach here

No early return from the raw keymap function at all. Definitely
fixes #28, and prevents any weirdness with malformed configs elsewhere.
---
 src/wl_input.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/wl_input.c b/src/wl_input.c
index 24445b8..d20babd 100644
--- a/src/wl_input.c
+++ b/src/wl_input.c
@@ -48,18 +48,17 @@ static void load_raw_keymap(struct wlContext *ctx)
 	}
 	/* start with the xkb maximum */
 	ctx->input.key_count = xkb_keymap_max_keycode(ctx->input.xkb_map);
-	if ((count = configReadFullSection("raw-keymap", &key, &val)) == -1) {
-		return;
-	}
-	/* slightly inefficient approach, but it will actually work
-	 * First pass -- just find the *real* maximum raw keycode */
-	for (i = 0; i < count; ++i) {
-		errno = 0;
-		lkey = strtol(key[i], &endstr, 0);
-		if (errno || endstr == key[i])
-			continue;
-		if (lkey >= ctx->input.key_count) {
-			ctx->input.key_count = lkey + 1;
+	if ((count = configReadFullSection("raw-keymap", &key, &val)) != -1) {
+		/* slightly inefficient approach, but it will actually work
+		 * First pass -- just find the *real* maximum raw keycode */
+		for (i = 0; i < count; ++i) {
+			errno = 0;
+			lkey = strtol(key[i], &endstr, 0);
+			if (errno || endstr == key[i])
+				continue;
+			if (lkey >= ctx->input.key_count) {
+				ctx->input.key_count = lkey + 1;
+			}
 		}
 	}
 	/* initialize everything */
@@ -67,6 +66,8 @@ static void load_raw_keymap(struct wlContext *ctx)
 	for (i = 0; i < ctx->input.key_count; ++i) {
 		ctx->input.raw_keymap[i] = i;
 	}
+	/* initialize key state tracking now that the size is known */
+	ctx->input.key_press_state = xcalloc(ctx->input.key_count, sizeof(*ctx->input.key_press_state));
 	/* and second pass -- store any actually mappings, apply offset */
 	offset = configTryLong("raw-keymap/offset", 0);
 	for (i = 0; i < count; ++i) {
@@ -99,8 +100,6 @@ int wlKeySetConfigLayout(struct wlContext *ctx)
 	ctx->input.xkb_key_offset = configTryLong("xkb_key_offset", 0);
 	ret = !ctx->input.key_map(&ctx->input, keymap_str);
 	load_raw_keymap(ctx);
-	/* initialize key state tracking now that the size is known */
-	ctx->input.key_press_state = xcalloc(ctx->input.key_count, sizeof(*ctx->input.key_press_state));
 	free(keymap_str);
 	return ret;
 }