Pass NULL, not 0, handle invalid --id better.
Mikael Magnusson mikachu@gmail.com
1 files changed,
5 insertions(+),
4 deletions(-)
jump to
M
tools/obxprop/obxprop.c
→
tools/obxprop/obxprop.c
@@ -273,13 +273,13 @@ gboolean root = FALSE;
for (i = 1; i < argc; ++i) { if (!strcmp(argv[i], "--help")) { - return fail(0); + return fail(NULL); } else if (!strcmp(argv[i], "--root")) root = TRUE; else if (!strcmp(argv[i], "--id")) { if (++i == argc) - return fail(0); + return fail(NULL); if (argv[i][0] == '0' && argv[i][1] == 'x') { /* hex */ userid = parse_hex(argv[i]+2);@@ -288,11 +288,12 @@ else {
/* decimal */ userid = atoi(argv[i]); } - break; + if (!userid) + return fail("Unable to parse argument to --id."); } else if (!strcmp(argv[i], "--display")) { if (++i == argc) - return fail(0); + return fail(NULL); dname = argv[i]; } else if (*argv[i] != '-')