mirrors
/
i3lock
mirror of https://github.com/i3/i3lock.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Skip leading # signs for the color, fix input validation

pull/1/head
Michael Stapelberg 2009-08-02 19:50:30 +02:00
parent 9c4dee2e86
commit 206036a852
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
i3lock.c
View File

@ -45,7 +45,6 @@ static void die(const char *errstr, ...) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
/* /*
* Returns the colorpixel to use for the given hex color (think of HTML). * Returns the colorpixel to use for the given hex color (think of HTML).
* *
@ -197,13 +196,17 @@ int main(int argc, char *argv[]) {
xpm_image = true; xpm_image = true;
break; break;
case 'c': case 'c':
strncpy(color, optarg, 6); {
color[6] = 0; char *arg = optarg;
/* Skip # if present */
if (arg[0] == '#')
arg++;
if (strlen(arg) != 6 || sscanf(arg, "%06[0-9a-fA-F]", color) != 1)
die("color is invalid, color must be given in 6-byte format: rrggbb\n");
char parsed_color[7];
if (strlen(color) != 6 || sscanf(color, "%06[0-9a-fA-F]", parsed_color) != 1)
die("color is invalid, color must be given in 6-byte format: rrggbb\n");
break; break;
}
default: default:
die("i3lock: Unknown option. Syntax: i3lock [-v] [-n] [-b] [-d] [-i image.xpm] [-c color]\n"); die("i3lock: Unknown option. Syntax: i3lock [-v] [-n] [-b] [-d] [-i image.xpm] [-c color]\n");
} }