From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 26 Sep 2004 13:39:25 +0000 (+0000)
Subject: [BZ #151]
X-Git-Tag: cvs/fedora-glibc-20040927T0611~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=625ef999a6354d9c024e886919830dfda7569f44;p=thirdparty%2Fglibc.git

[BZ #151]

Update.
	* elf/readlib.c (process_file): Before complaining about too-short
	file, check that it potentially be an ELF file.  Also complain about
	empty files.  [BZ #151].
---

diff --git a/ChangeLog b/ChangeLog
index 13c49cdbcb0..e037596192b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-09-26  Ulrich Drepper  <drepper@redhat.com>
 
+	* elf/readlib.c (process_file): Before complaining about too-short
+	file, check that it potentially be an ELF file.  Also complain about
+	empty files.  [BZ #151].
+
 	* scripts/test-installation.pl: Fix ld.so recognition for new
 	LD_TRACE_LOADED_OBJECTS output format.
 	Patch by <jsberg04+computing.glibc@ftml.net>  [BZ #407].
diff --git a/elf/readlib.c b/elf/readlib.c
index a1fec945893..4fbc3e5e4c8 100644
--- a/elf/readlib.c
+++ b/elf/readlib.c
@@ -105,7 +105,15 @@ process_file (const char *real_file_name, const char *file_name,
   if ((size_t) statbuf.st_size < sizeof (struct exec)
       || (size_t) statbuf.st_size < sizeof (ElfW(Ehdr)))
     {
-      error (0, 0, _("File %s is too small, not checked."), file_name);
+      if (statbuf.st_size == 0)
+	error (0, 0, _("File %s is empty, not checked."), file_name);
+      else
+	{
+	  char buf[SELFMAG];
+	  size_t n = MIN (statbuf.st_size, SELFMAG);
+	  if (fread (buf, n, 1, file) == 1 && memcmp (buf, ELFMAG, n) == 0)
+	    error (0, 0, _("File %s is too small, not checked."), file_name);
+	}
       fclose (file);
       return 1;
     }