Browse Source

If /etc/ld.so.preload was size 0, the shared lib loader would
choke and die. Test for non-zero size as well,
-Erik

Eric Andersen 24 years ago
parent
commit
bd61f74bf3
2 changed files with 2 additions and 2 deletions
  1. 1 1
      ldso/ldso/boot1.c
  2. 1 1
      ldso/ldso/ldso.c

+ 1 - 1
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);

+ 1 - 1
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);