diff options
| author | nicm <nicm> | 2021-09-02 07:11:03 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2021-09-02 07:11:03 +0000 |
| commit | 329c2c2a919d3c66b08672ff37af4e2393dc9a95 (patch) | |
| tree | b733818547334bca07e96b930948e3d9c5b2bc3f | |
| parent | daec63e5e6eb3390d53f4bf7f8a327df77e46c95 (diff) | |
| download | rtmux-329c2c2a919d3c66b08672ff37af4e2393dc9a95.tar.gz rtmux-329c2c2a919d3c66b08672ff37af4e2393dc9a95.tar.bz2 rtmux-329c2c2a919d3c66b08672ff37af4e2393dc9a95.zip | |
Change copying arguments to that flags without arguments are inserted
correctly and empty arguments lists do not crash. Fixes crash reported
by & ok mpi@.
| -rw-r--r-- | arguments.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arguments.c b/arguments.c index d7274ff8..20d5e7ba 100644 --- a/arguments.c +++ b/arguments.c @@ -302,10 +302,13 @@ args_copy(struct args *args, int argc, char **argv) struct args_value *value, *new_value; u_int i; + cmd_log_argv(argc, argv, "%s", __func__); + new_args = args_create(); RB_FOREACH(entry, args_tree, &args->tree) { - if (entry->count == 1) { - args_set(new_args, entry->flag, NULL); + if (TAILQ_EMPTY(&entry->values)) { + for (i = 0; i < entry->count; i++) + args_set(new_args, entry->flag, NULL); continue; } TAILQ_FOREACH(value, &entry->values, entry) { @@ -314,6 +317,8 @@ args_copy(struct args *args, int argc, char **argv) args_set(new_args, entry->flag, new_value); } } + if (args->count == 0) + return (new_args); new_args->count = args->count; new_args->values = xcalloc(args->count, sizeof *new_args->values); for (i = 0; i < args->count; i++) { |