emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

librc: Fix crash if the service name is the same as the including runlevel

Browse Source 
If a service has the same name as the runlevel it is in, openrc will
crash on changing to such runlevel. It goes in a recursive madness and
eventually gets a SEGV while in snprintf (don't know why).

This fixes two errors:
1. ls_dir stats files not with full path -> stat always returns != 0
2. ls_dir adds files to list if stat failed

This fixes #53.

X-Gentoo-Bug: 537304
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=537304
This commit is contained in:
Jakob Drexel 2015-05-03 11:06:45 +02:00 committed by William Hubbs
parent 9f6427ea57
commit 0b435ddd83
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librc/librc.c
View File

@ -101,7 +101,9 @@ ls_dir(const char *dir, int options)
continue; continue;
} }
if (options & LS_DIR) { if (options & LS_DIR) {
if (stat(d->d_name, &buf) == 0 && snprintf(file, sizeof(file), "%s/%s",
dir, d->d_name);
if (stat(file, &buf) != 0 ||
!S_ISDIR(buf.st_mode)) !S_ISDIR(buf.st_mode))
continue; continue;
} }