From 1f0718a89793bcb933ded30bc9fed9fd5cb5ba17 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 27 Jan 2014 07:47:17 +0000 Subject: Fix crash if -g, -k, or -p is the last command-line argument Forwarded: no Last-Update: 2013-06-26 Patch-Name: arg-parse-crash.patch --- kali.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kali.c b/kali.c index 280d058..2e60bc0 100644 --- a/kali.c +++ b/kali.c @@ -420,14 +420,14 @@ int main(int argc, char** argv) { frieze=0; else if (STREQ(*argv, "-m")) moron=1; - else if (STREQ(*argv, "-k") && ++argv) { + else if (STREQ(*argv, "-k") && *(argv + 1)) { --argc; - fname = *argv; - } else if (STREQ(*argv, "-g") && ++argv) { - sscanf(*argv, "%f,%f,%f,%f", &kwin.x, &kwin.y, &kwin.width, &kwin.height); + fname = *++argv; + } else if (STREQ(*argv, "-g") && *(argv + 1)) { + sscanf(*++argv, "%f,%f,%f,%f", &kwin.x, &kwin.y, &kwin.width, &kwin.height); argc--; - } else if (STREQ(*argv, "-p") && ++argv) { - sscanf(*argv, "%f,%f,%f,%f", &pwin.x, &pwin.y, &pwin.width, &pwin.height); + } else if (STREQ(*argv, "-p") && *(argv + 1)) { + sscanf(*++argv, "%f,%f,%f,%f", &pwin.x, &pwin.y, &pwin.width, &pwin.height); argc--; } else if((*argv)[0] != '-') { fname = *argv;