shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-04 09:18:36 +03:00
Code Releases Activity

cleanup: explicit check for nonnull pointer

Browse Source 
Since execvp requires nonnull args - add explicit check.
This commit is contained in:
Zdenek Kabelac 2013-04-19 21:10:19 +02:00
parent dd4fdce16c
commit dfca5dac9c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/misc/lvm-exec.c
View File

@ -54,7 +54,6 @@ int exec_cmd(struct cmd_context *cmd, const char *const argv[],
int status; int status;
char buf[PATH_MAX * 2]; char buf[PATH_MAX * 2];
if (rstatus) if (rstatus)
*rstatus = -1; *rstatus = -1;
@ -76,6 +75,7 @@ int exec_cmd(struct cmd_context *cmd, const char *const argv[],
/* FIXME Fix effect of reset_locking on cache then include this */ /* FIXME Fix effect of reset_locking on cache then include this */
/* destroy_toolcontext(cmd); */ /* destroy_toolcontext(cmd); */
/* FIXME Use execve directly */ /* FIXME Use execve directly */
if (argv[0])
execvp(argv[0], (char **) argv); execvp(argv[0], (char **) argv);
log_sys_error("execvp", argv[0]); log_sys_error("execvp", argv[0]);
_exit(errno); _exit(errno);

2
tools/lvmcmdline.c
View File

@ -1499,7 +1499,7 @@ int lvm2_main(int argc, char **argv)
return -1; return -1;
if (is_static() && strcmp(base, "lvm.static") && if (is_static() && strcmp(base, "lvm.static") &&
path_exists(LVM_SHARED_PATH) && path_exists(LVM_SHARED_PATH) && argv &&
!getenv("LVM_DID_EXEC")) { !getenv("LVM_DID_EXEC")) {
if (setenv("LVM_DID_EXEC", base, 1)) if (setenv("LVM_DID_EXEC", base, 1))
log_sys_error("setenv", "LVM_DID_EXEC"); log_sys_error("setenv", "LVM_DID_EXEC");