From 5cd84ad93f7d67cdaa134707fcce1b1ef85183ad Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Fri, 26 Feb 2021 18:40:37 +0100
Subject: Full UBSan support - many fixes!

---
 apps/link.ld | 15 ++++++---------
 apps/wm.c    |  3 +++
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'apps')

diff --git a/apps/link.ld b/apps/link.ld
index 2b9599a..781e38d 100644
--- a/apps/link.ld
+++ b/apps/link.ld
@@ -8,27 +8,24 @@ SECTIONS
 	. = 0x00000000;
 
 	.text : {
+		code = .;
 		*(.text)
-	}
-
-	.rodata : {
 		*(.rodata)
+		. = ALIGN(4096);
 	}
 
-	. = ALIGN(4096);
-
 	.data : {
+		data = .;
 		*(.data)
+		. = ALIGN(4096);
 	}
 
-	. = ALIGN(4096);
-
 	.bss : {
+		bss = .;
 		*(.bss)
+		. = ALIGN(4096);
 	}
 
-	. = ALIGN(4096);
-
 	_GLOBAL_OFFSET_TABLE_ = .;
 
 	. = ALIGN(4096);
diff --git a/apps/wm.c b/apps/wm.c
index abbb2bd..a9f22d5 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -251,6 +251,9 @@ static void handle_event_keyboard(struct event_keyboard *event)
 	else if (event->scancode == KEY_LEFTCTRL || event->scancode == KEY_RIGHTCTRL)
 		special_keys.ctrl ^= 1;
 
+	if (event->scancode > KEYMAP_LENGTH)
+		return;
+
 	char ch;
 	if (special_keys.shift)
 		ch = keymap->shift_map[event->scancode];
-- 
cgit v1.2.3