mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-14 21:17:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[client] added checking for invalid arguments to custom string options

Browse source
This commit is contained in:
Geoffrey McRae 2020-01-19 06:48:20 +11:00
parent 4746c89227
commit 2c59b5f557
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
B1-98-g278d851c7c+1 B1-99-g4746c89227+1

11
client/src/config.c
View file

@ -449,6 +449,9 @@ static void doLicense()
static bool optRendererParse(struct Option * opt, const char * str) static bool optRendererParse(struct Option * opt, const char * str)
{ {
if (!str)
return false;
if (strcasecmp(str, "auto") == 0) if (strcasecmp(str, "auto") == 0)
{ {
params.forceRenderer = false; params.forceRenderer = false;
@ -490,6 +493,9 @@ static char * optRendererToString(struct Option * opt)
static bool optPosParse(struct Option * opt, const char * str) static bool optPosParse(struct Option * opt, const char * str)
{ {
if (!str)
return false;
if (strcmp(str, "center") == 0) if (strcmp(str, "center") == 0)
{ {
params.center = true; params.center = true;
@ -527,6 +533,9 @@ static char * optPosToString(struct Option * opt)
static bool optSizeParse(struct Option * opt, const char * str) static bool optSizeParse(struct Option * opt, const char * str)
{ {
if (!str)
return false;
if (sscanf(str, "%dx%d", &params.w, &params.h) == 2) if (sscanf(str, "%dx%d", &params.w, &params.h) == 2)
{ {
if (params.w < 1 || params.h < 1) if (params.w < 1 || params.h < 1)
@ -558,4 +567,4 @@ static char * optScancodeToString(struct Option * opt)
char * str; char * str;
alloc_sprintf(&str, "%d = %s", opt->value.x_int, SDL_GetScancodeName(opt->value.x_int)); alloc_sprintf(&str, "%d = %s", opt->value.x_int, SDL_GetScancodeName(opt->value.x_int));
return str; return str;
} }