diff options
| author | Dominique Martinet <asmadeus@codewreck.org> | 2018-06-30 22:16:54 +0900 |
|---|---|---|
| committer | Dominique Martinet <asmadeus@codewreck.org> | 2018-07-02 08:03:41 +0900 |
| commit | ab187405297b77f85e0d5ed9630ae43b2db61324 (patch) | |
| tree | aa8de78559f56439eff75d8b605eaa0d347a9f32 | |
| parent | 557a14a6fe79002427008a0cf831808202609ae4 (diff) | |
output commands: move !argc checks after argc gets decremented
Found through static analysis.
| -rw-r--r-- | sway/commands/output/mode.c | 2 | ||||
| -rw-r--r-- | sway/commands/output/position.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sway/commands/output/mode.c b/sway/commands/output/mode.c index daec6d44..ef56ae9e 100644 --- a/sway/commands/output/mode.c +++ b/sway/commands/output/mode.c @@ -36,11 +36,11 @@ struct cmd_results *output_cmd_mode(int argc, char **argv) { } } else { // Format is 1234 4321 + argc--; argv++; if (!argc) { return cmd_results_new(CMD_INVALID, "output", "Missing mode argument (height)."); } - argc--; argv++; output->height = strtol(*argv, &end, 10); if (*end) { return cmd_results_new(CMD_INVALID, "output", diff --git a/sway/commands/output/position.c b/sway/commands/output/position.c index c2aeb281..449767b1 100644 --- a/sway/commands/output/position.c +++ b/sway/commands/output/position.c @@ -27,11 +27,11 @@ struct cmd_results *output_cmd_position(int argc, char **argv) { } } else { // Format is 1234 4321 (legacy) + argc--; argv++; if (!argc) { return cmd_results_new(CMD_INVALID, "output", "Missing position argument (y)."); } - argc--; argv++; config->handler_context.output_config->y = strtol(*argv, &end, 10); if (*end) { return cmd_results_new(CMD_INVALID, "output", |