From bd61f74bf3cb8f0ff7906db1c9ff745925af8980 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Mon, 6 Aug 2001 19:27:51 +0000 Subject: If /etc/ld.so.preload was size 0, the shared lib loader would choke and die. Test for non-zero size as well, -Erik --- ldso/ldso/boot1.c | 2 +- ldso/ldso/ldso.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ldso') diff --git a/ldso/ldso/boot1.c b/ldso/ldso/boot1.c index 4a3dbcea8..038a68dbb 100644 --- a/ldso/ldso/boot1.c +++ b/ldso/ldso/boot1.c @@ -672,7 +672,7 @@ found_got: struct stat st; char *preload; - if (!_dl_stat(LDSO_PRELOAD, &st)) { + if (!_dl_stat(LDSO_PRELOAD, &st) && st.st_size > 0) { if ((fd = _dl_open(LDSO_PRELOAD, O_RDONLY)) < 0) { _dl_fprintf(2, "%s: can't open file '%s'\n", _dl_progname, LDSO_PRELOAD); diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c index 4a3dbcea8..038a68dbb 100644 --- a/ldso/ldso/ldso.c +++ b/ldso/ldso/ldso.c @@ -672,7 +672,7 @@ found_got: struct stat st; char *preload; - if (!_dl_stat(LDSO_PRELOAD, &st)) { + if (!_dl_stat(LDSO_PRELOAD, &st) && st.st_size > 0) { if ((fd = _dl_open(LDSO_PRELOAD, O_RDONLY)) < 0) { _dl_fprintf(2, "%s: can't open file '%s'\n", _dl_progname, LDSO_PRELOAD); -- cgit v1.2.3