shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

cov: do not try to change passed in argv

Browse Source 
It's not a good idea to change passed 'argv[]' and replace it with
pointers to local stack - although in this case we are not using
this argv[] after return from this function.
This commit is contained in:
Zdenek Kabelac 2021-09-10 16:04:43 +02:00
parent aa522d5862
commit a7258ae394
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/lvmcmdline.c
View File

@ -3586,6 +3586,8 @@ static int _run_script(struct cmd_context *cmd, int argc, char **argv)
int ret = ENO_SUCH_CMD; int ret = ENO_SUCH_CMD;
int magic_number = 0; int magic_number = 0;
char *script_file = argv[0]; char *script_file = argv[0];
int largc;
char *largv[MAX_ARGS];
if ((script = fopen(script_file, "r")) == NULL) if ((script = fopen(script_file, "r")) == NULL)
return ENO_SUCH_CMD; return ENO_SUCH_CMD;
@ -3607,17 +3609,17 @@ static int _run_script(struct cmd_context *cmd, int argc, char **argv)
ret = EINVALID_CMD_LINE; ret = EINVALID_CMD_LINE;
break; break;
} }
if (lvm_split(buffer, &argc, argv, MAX_ARGS) == MAX_ARGS) { if (lvm_split(buffer, &largc, largv, MAX_ARGS) == MAX_ARGS) {
buffer[50] = '\0'; buffer[50] = '\0';
log_error("Too many arguments: %s", buffer); log_error("Too many arguments: %s", buffer);
ret = EINVALID_CMD_LINE; ret = EINVALID_CMD_LINE;
break; break;
} }
if (!argc) if (!largc)
continue; continue;
if (!strcmp(argv[0], "quit") || !strcmp(argv[0], "exit")) if (!strcmp(largv[0], "quit") || !strcmp(largv[0], "exit"))
break; break;
ret = lvm_run_command(cmd, argc, argv); ret = lvm_run_command(cmd, largc, largv);
/* /*
* FIXME: handling scripts with invalid or failing commands * FIXME: handling scripts with invalid or failing commands
* could use some cleaning up, e.g. error_message_produced * could use some cleaning up, e.g. error_message_produced