stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix infinite loop in spawn code if bad PATH is supplied. Thanks to Rene Herbrich for spotting. Fixes #1144.

Browse source
This commit is contained in:
Adam Sutton 2012-08-22 21:23:47 +01:00
parent 4493e89234
commit 708b21897f
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/spawn.c
View file

@ -61,17 +61,18 @@ _find_exec ( const char *name, char *out, size_t len )
path = strdup(path);
tmp = strtok(path, ":");
while (tmp && !ret) {
if (!(dir = opendir(tmp))) continue;
while ((de = readdir(dir))) {
if (strstr(de->d_name, name) != de->d_name) continue;
snprintf(bin, sizeof(bin), "%s/%s", tmp, de->d_name);
if (lstat(bin, &st)) continue;
if (!S_ISREG(st.st_mode) || !(st.st_mode & S_IEXEC)) continue;
strncpy(out, bin, len);
ret = 1;
break;
if ((dir = opendir(tmp))) {
while ((de = readdir(dir))) {
if (strstr(de->d_name, name) != de->d_name) continue;
snprintf(bin, sizeof(bin), "%s/%s", tmp, de->d_name);
if (lstat(bin, &st)) continue;
if (!S_ISREG(st.st_mode) || !(st.st_mode & S_IEXEC)) continue;
strncpy(out, bin, len);
ret = 1;
break;
}
closedir(dir);
}
closedir(dir);
tmp = strtok(NULL, ":");
}
free(path);