External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 03:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Resolve Coverity RESOURCE_LEAK in commandhelper

Browse Source 
Coverity determined that 'log' and 'newenv' were not freed in
some cases. Free them in 'error' branch and normal branch.

Signed-off-by: Wang Rui <moon.wangrui@huawei.com>
This commit is contained in:
Wang Rui 2014-09-03 14:59:31 -04:00 committed by John Ferlan
parent 0c07d360f6
commit cd2d7c6c3a
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/commandhelper.c
View File

@ -62,12 +62,13 @@ int main(int argc, char **argv) {
size_t i, n; size_t i, n;
int open_max; int open_max;
char **origenv; char **origenv;
char **newenv; char **newenv = NULL;
char *cwd; char *cwd;
FILE *log = fopen(abs_builddir "/commandhelper.log", "w"); FILE *log = fopen(abs_builddir "/commandhelper.log", "w");
int ret = EXIT_FAILURE;
if (!log) if (!log)
goto error; goto cleanup;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
fprintf(log, "ARG:%s\n", argv[i]); fprintf(log, "ARG:%s\n", argv[i]);
@ -81,7 +82,7 @@ int main(int argc, char **argv) {
} }
if (VIR_ALLOC_N_QUIET(newenv, n) < 0) if (VIR_ALLOC_N_QUIET(newenv, n) < 0)
return EXIT_FAILURE; goto cleanup;
origenv = environ; origenv = environ;
n = i = 0; n = i = 0;
@ -101,7 +102,7 @@ int main(int argc, char **argv) {
open_max = sysconf(_SC_OPEN_MAX); open_max = sysconf(_SC_OPEN_MAX);
if (open_max < 0) if (open_max < 0)
return EXIT_FAILURE; goto cleanup;
for (i = 0; i < open_max; i++) { for (i = 0; i < open_max; i++) {
int f; int f;
int closed; int closed;
@ -115,7 +116,7 @@ int main(int argc, char **argv) {
fprintf(log, "DAEMON:%s\n", getpgrp() == getsid(0) ? "yes" : "no"); fprintf(log, "DAEMON:%s\n", getpgrp() == getsid(0) ? "yes" : "no");
if (!(cwd = getcwd(NULL, 0))) if (!(cwd = getcwd(NULL, 0)))
return EXIT_FAILURE; goto cleanup;
if (strlen(cwd) > strlen(".../commanddata") && if (strlen(cwd) > strlen(".../commanddata") &&
STREQ(cwd + strlen(cwd) - strlen("/commanddata"), "/commanddata")) STREQ(cwd + strlen(cwd) - strlen("/commanddata"), "/commanddata"))
strcpy(cwd, ".../commanddata"); strcpy(cwd, ".../commanddata");
@ -124,11 +125,9 @@ int main(int argc, char **argv) {
fprintf(log, "UMASK:%04o\n", umask(0)); fprintf(log, "UMASK:%04o\n", umask(0));
VIR_FORCE_FCLOSE(log);
if (argc > 1 && STREQ(argv[1], "--close-stdin")) { if (argc > 1 && STREQ(argv[1], "--close-stdin")) {
if (freopen("/dev/null", "r", stdin) != stdin) if (freopen("/dev/null", "r", stdin) != stdin)
goto error; goto cleanup;
usleep(100*1000); usleep(100*1000);
} }
@ -143,13 +142,13 @@ int main(int argc, char **argv) {
for (;;) { for (;;) {
got = read(STDIN_FILENO, buf, sizeof(buf)); got = read(STDIN_FILENO, buf, sizeof(buf));
if (got < 0) if (got < 0)
goto error; goto cleanup;
if (got == 0) if (got == 0)
break; break;
if (safewrite(STDOUT_FILENO, buf, got) != got) if (safewrite(STDOUT_FILENO, buf, got) != got)
goto error; goto cleanup;
if (safewrite(STDERR_FILENO, buf, got) != got) if (safewrite(STDERR_FILENO, buf, got) != got)
goto error; goto cleanup;
} }
fprintf(stdout, "END STDOUT\n"); fprintf(stdout, "END STDOUT\n");
@ -157,10 +156,12 @@ int main(int argc, char **argv) {
fprintf(stderr, "END STDERR\n"); fprintf(stderr, "END STDERR\n");
fflush(stderr); fflush(stderr);
return EXIT_SUCCESS; ret = EXIT_SUCCESS;
error: cleanup:
return EXIT_FAILURE; VIR_FORCE_FCLOSE(log);
VIR_FREE(newenv);
return ret;
} }
#else #else