diff options
Diffstat (limited to 'cmd/zfs/zfs_main.c')
| -rw-r--r-- | cmd/zfs/zfs_main.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c index 162cef6fb..cf2d8f2d5 100644 --- a/cmd/zfs/zfs_main.c +++ b/cmd/zfs/zfs_main.c @@ -7910,6 +7910,7 @@ main(int argc, char **argv) int ret = 0; int i = 0; char *cmdname; + char **newargv; (void) setlocale(LC_ALL, ""); (void) textdomain(TEXT_DOMAIN); @@ -7963,16 +7964,25 @@ main(int argc, char **argv) libzfs_print_on_error(g_zfs, B_TRUE); /* + * Many commands modify input strings for string parsing reasons. + * We create a copy to protect the original argv. + */ + newargv = malloc((argc + 1) * sizeof (newargv[0])); + for (i = 0; i < argc; i++) + newargv[i] = strdup(argv[i]); + newargv[argc] = NULL; + + /* * Run the appropriate command. */ libzfs_mnttab_cache(g_zfs, B_TRUE); if (find_command_idx(cmdname, &i) == 0) { current_command = &command_table[i]; - ret = command_table[i].func(argc - 1, argv + 1); + ret = command_table[i].func(argc - 1, newargv + 1); } else if (strchr(cmdname, '=') != NULL) { verify(find_command_idx("set", &i) == 0); current_command = &command_table[i]; - ret = command_table[i].func(argc, argv); + ret = command_table[i].func(argc, newargv); } else { (void) fprintf(stderr, gettext("unrecognized " "command '%s'\n"), cmdname); @@ -7980,6 +7990,10 @@ main(int argc, char **argv) ret = 1; } + for (i = 0; i < argc; i++) + free(newargv[i]); + free(newargv); + if (ret == 0 && log_history) (void) zpool_log_history(g_zfs, history_str); |