mirror of
https://github.com/swaywm/sway.git
synced 2024-11-30 03:41:27 +00:00
output commands: move !argc checks after argc gets decremented
Found through static analysis.
This commit is contained in:
parent
557a14a6fe
commit
ab18740529
|
@ -36,11 +36,11 @@ struct cmd_results *output_cmd_mode(int argc, char **argv) {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Format is 1234 4321
|
// Format is 1234 4321
|
||||||
|
argc--; argv++;
|
||||||
if (!argc) {
|
if (!argc) {
|
||||||
return cmd_results_new(CMD_INVALID, "output",
|
return cmd_results_new(CMD_INVALID, "output",
|
||||||
"Missing mode argument (height).");
|
"Missing mode argument (height).");
|
||||||
}
|
}
|
||||||
argc--; argv++;
|
|
||||||
output->height = strtol(*argv, &end, 10);
|
output->height = strtol(*argv, &end, 10);
|
||||||
if (*end) {
|
if (*end) {
|
||||||
return cmd_results_new(CMD_INVALID, "output",
|
return cmd_results_new(CMD_INVALID, "output",
|
||||||
|
|
|
@ -27,11 +27,11 @@ struct cmd_results *output_cmd_position(int argc, char **argv) {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Format is 1234 4321 (legacy)
|
// Format is 1234 4321 (legacy)
|
||||||
|
argc--; argv++;
|
||||||
if (!argc) {
|
if (!argc) {
|
||||||
return cmd_results_new(CMD_INVALID, "output",
|
return cmd_results_new(CMD_INVALID, "output",
|
||||||
"Missing position argument (y).");
|
"Missing position argument (y).");
|
||||||
}
|
}
|
||||||
argc--; argv++;
|
|
||||||
config->handler_context.output_config->y = strtol(*argv, &end, 10);
|
config->handler_context.output_config->y = strtol(*argv, &end, 10);
|
||||||
if (*end) {
|
if (*end) {
|
||||||
return cmd_results_new(CMD_INVALID, "output",
|
return cmd_results_new(CMD_INVALID, "output",
|
||||||
|
|
Loading…
Reference in a new issue