diff options
| author | Jakob Drexel <jake42@rommel.stw.uni-erlangen.de> | 2015-05-03 11:06:45 +0200 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2015-05-04 09:54:51 -0500 |
| commit | 0b435ddd834bd18254c4d3341acdebf0829921f5 (patch) | |
| tree | a36cdd54fe6cb1284a73b0cf29654051df3a01c6 /src | |
| parent | 9f6427ea57c6c950b4d1c356ad1bfb0aa8deb40b (diff) | |
librc: Fix crash if the service name is the same as the including runlevel
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/librc/librc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/librc/librc.c b/src/librc/librc.c index 03448e79..8f043131 100644 --- a/src/librc/librc.c +++ b/src/librc/librc.c @@ -101,7 +101,9 @@ ls_dir(const char *dir, int options) continue; } 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)) continue; } |