From a4b20c800a91a1be9177915bd00c28d19ad72ca3 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Thu, 2 Mar 2006 03:18:21 +0000
Subject: [PATCH] Date: Wed, 1 Mar 2006 23:52:09 +0100 From: Sam Hocevar
 Subject: [SDL] [patch] aalib driver

   Hi there. The attached patch fixes a buffer overflow in the aalib
driver and also adds a workaround for a conflict between arrow keys and
the numeric keypad that have the same scancode on aalib. The patch gives
precedence to the arrow keys.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401462
---
 src/video/aalib/SDL_aaevents.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/video/aalib/SDL_aaevents.c b/src/video/aalib/SDL_aaevents.c
index 5ff97355a..7811f1932 100644
--- a/src/video/aalib/SDL_aaevents.c
+++ b/src/video/aalib/SDL_aaevents.c
@@ -126,12 +126,6 @@ void AA_InitOSKeymap(_THIS)
 	for ( i=0; i<SDL_arraysize(keymap); ++i )
 		keymap[i] = SDLK_UNKNOWN;
 
-	keymap[AA_ESC] = SDLK_ESCAPE;
-	keymap[AA_UP] = SDLK_UP;
-	keymap[AA_DOWN] = SDLK_DOWN;
-	keymap[AA_LEFT] = SDLK_LEFT;
-	keymap[AA_RIGHT] = SDLK_RIGHT;
-
 	/* Alphabet keys */
 	for ( i = 0; i<26; ++i ){
 		keymap['a' + i] = SDLK_a+i;
@@ -179,10 +173,20 @@ void AA_InitOSKeymap(_THIS)
 	keymap[293] = SDLK_KP7;
 	keymap[295] = SDLK_KP8;
 	keymap[298] = SDLK_KP9;
+
+	keymap[AA_ESC] = SDLK_ESCAPE;
+	keymap[AA_UP] = SDLK_UP;
+	keymap[AA_DOWN] = SDLK_DOWN;
+	keymap[AA_LEFT] = SDLK_LEFT;
+	keymap[AA_RIGHT] = SDLK_RIGHT;
 }
 
 static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym)
 {
+	/* Sanity check */
+	if ( scancode >= SDL_arraysize(keymap) )
+		scancode = AA_UNKNOWN;
+
 	/* Set the keysym information */
 	keysym->scancode = scancode;
 	keysym->sym = keymap[scancode];