pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add input validation to SDL_GetKeyFromScancode; fix compiler warning in testautomation driver on Linux; update keyboard test suite

Browse source
This commit is contained in:
Andreas Schiffler 2013-01-13 22:55:26 -08:00
parent 175511b1a0
commit 3bc9dbe16c
3 changed files with 47 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/events/SDL_keyboard.c
View file

@ -860,6 +860,11 @@ SDL_Keycode
SDL_GetKeyFromScancode(SDL_Scancode scancode) SDL_GetKeyFromScancode(SDL_Scancode scancode)
{ {
SDL_Keyboard *keyboard = &SDL_keyboard; SDL_Keyboard *keyboard = &SDL_keyboard;
if (scancode<SDL_SCANCODE_UNKNOWN || scancode >= SDL_NUM_SCANCODES) {
SDL_InvalidParamError("scancode");
return 0;
}
return keyboard->keymap[scancode]; return keyboard->keymap[scancode];
} }

2
test/testautomation.c
View file

@ -61,7 +61,7 @@ main(int argc, char *argv[])
} }
else if (SDL_strcasecmp(argv[i], "--execKey") == 0) { else if (SDL_strcasecmp(argv[i], "--execKey") == 0) {
if (argv[i + 1]) { if (argv[i + 1]) {
SDL_sscanf(argv[i + 1], "%llu", &userExecKey); SDL_sscanf(argv[i + 1], "%llu", (long long unsigned int *)&userExecKey);
consumed = 2; consumed = 2;
} }
} }

44
test/testautomation_keyboard.c
View file

@ -4,6 +4,7 @@
#include <stdio.h> #include <stdio.h>
#include "SDL_config.h"
#include "SDL.h" #include "SDL.h"
#include "SDL_test.h" #include "SDL_test.h"
@ -110,6 +111,8 @@ keyboard_getKeyFromName(void *arg)
int int
keyboard_getKeyFromScancode(void *arg) keyboard_getKeyFromScancode(void *arg)
{ {
const char *expectedError = "Parameter 'scancode' is invalid";
const char *error;
SDL_Keycode result; SDL_Keycode result;
/* Case where input is valid */ /* Case where input is valid */
@ -119,13 +122,41 @@ keyboard_getKeyFromScancode(void *arg)
/* Case where input is zero */ /* Case where input is zero */
result = SDL_GetKeyFromScancode(0); result = SDL_GetKeyFromScancode(0);
SDLTest_AssertPass("Call to SDL_GetKeyFromScancode(zero)"); SDLTest_AssertPass("Call to SDL_GetKeyFromScancode(0)");
SDLTest_AssertCheck(result == SDLK_UNKNOWN, "Verify result from call is UNKNOWN, expected: %i, got: %i", SDLK_UNKNOWN, result); SDLTest_AssertCheck(result == SDLK_UNKNOWN, "Verify result from call is UNKNOWN, expected: %i, got: %i", SDLK_UNKNOWN, result);
/* Case where input is invalid */ SDL_ClearError();
SDLTest_AssertPass("Call to SDL_ClearError()");
/* Case where input is invalid (too small) */
result = SDL_GetKeyFromScancode(-999); result = SDL_GetKeyFromScancode(-999);
SDLTest_AssertPass("Call to SDL_GetKeyFromScancode(invalid)"); SDLTest_AssertPass("Call to SDL_GetKeyFromScancode(-999)");
SDLTest_AssertCheck(result == SDLK_UNKNOWN, "Verify result from call is UNKNOWN, expected: %i, got: %i", SDLK_UNKNOWN, result); SDLTest_AssertCheck(result == SDLK_UNKNOWN, "Verify result from call is UNKNOWN, expected: %i, got: %i", SDLK_UNKNOWN, result);
error = SDL_GetError();
SDLTest_AssertPass("Call to SDL_GetError()");
SDLTest_AssertCheck(error != NULL, "Validate that error message was not NULL");
if (error != NULL) {
SDLTest_AssertCheck(SDL_strcmp(error, expectedError) == 0,
"Validate error message, expected: '%s', got: '%s'", expectedError, error);
}
SDL_ClearError();
SDLTest_AssertPass("Call to SDL_ClearError()");
/* Case where input is invalid (too big) */
result = SDL_GetKeyFromScancode(999);
SDLTest_AssertPass("Call to SDL_GetKeyFromScancode(999)");
SDLTest_AssertCheck(result == SDLK_UNKNOWN, "Verify result from call is UNKNOWN, expected: %i, got: %i", SDLK_UNKNOWN, result);
error = SDL_GetError();
SDLTest_AssertPass("Call to SDL_GetError()");
SDLTest_AssertCheck(error != NULL, "Validate that error message was not NULL");
if (error != NULL) {
SDLTest_AssertCheck(SDL_strcmp(error, expectedError) == 0,
"Validate error message, expected: '%s', got: '%s'", expectedError, error);
}
SDL_ClearError();
SDLTest_AssertPass("Call to SDL_ClearError()");
return TEST_COMPLETED; return TEST_COMPLETED;
} }
@ -382,15 +413,21 @@ keyboard_setTextInputRect(void *arg)
int int
keyboard_setTextInputRectNegative(void *arg) keyboard_setTextInputRectNegative(void *arg)
{ {
/* Some platforms set also an error message; prepare for checking it */
#if SDL_VIDEO_DRIVER_WINDOWS || SDL_VIDEO_DRIVER_ANDROID || SDL_VIDEO_DRIVER_COCOA
const char *expectedError = "Parameter 'rect' is invalid"; const char *expectedError = "Parameter 'rect' is invalid";
const char *error; const char *error;
SDL_ClearError(); SDL_ClearError();
SDLTest_AssertPass("Call to SDL_ClearError()"); SDLTest_AssertPass("Call to SDL_ClearError()");
#endif
/* NULL refRect */ /* NULL refRect */
SDL_SetTextInputRect(NULL); SDL_SetTextInputRect(NULL);
SDLTest_AssertPass("Call to SDL_SetTextInputRect(NULL)"); SDLTest_AssertPass("Call to SDL_SetTextInputRect(NULL)");
/* Some platforms set also an error message; so check it */
#if SDL_VIDEO_DRIVER_WINDOWS || SDL_VIDEO_DRIVER_ANDROID || SDL_VIDEO_DRIVER_COCOA
error = SDL_GetError(); error = SDL_GetError();
SDLTest_AssertPass("Call to SDL_GetError()"); SDLTest_AssertPass("Call to SDL_GetError()");
SDLTest_AssertCheck(error != NULL, "Validate that error message was not NULL"); SDLTest_AssertCheck(error != NULL, "Validate that error message was not NULL");
@ -401,6 +438,7 @@ keyboard_setTextInputRectNegative(void *arg)
SDL_ClearError(); SDL_ClearError();
SDLTest_AssertPass("Call to SDL_ClearError()"); SDLTest_AssertPass("Call to SDL_ClearError()");
#endif
return TEST_COMPLETED; return TEST_COMPLETED;
} }