NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

testutils: Adapt to highly unlikely case

Browse Source 
Coverity pointed out that getenv("PATH") may return NULL. Well,
we check for that in virFindFileInPath() too. If this happens, we
will pass NULL into strstr(). Ouch.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik
2016-03-24 14:57:42 +01:00
parent 8c50daa1e1
commit 98354e362c
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/testutils.c
View File

@@ -813,9 +813,16 @@ virTestSetEnvPath(void)
const char *path = getenv("PATH");
char *new_path = NULL;
if (strstr(path, abs_builddir) != path &&
(virAsprintf(&new_path, "%s:%s", abs_builddir, path) < 0 ||
setenv("PATH", new_path, 1) < 0))
if (path) {
if (strstr(path, abs_builddir) != path &&
virAsprintf(&new_path, "%s:%s", abs_builddir, path) < 0)
goto cleanup;
} else {
if (VIR_STRDUP(new_path, abs_builddir) < 0)
goto cleanup;
}
if (setenv("PATH", new_path, 1) < 0)
goto cleanup;
ret = 0;