2009-11-27 Tristan Gingold <gingold@adacore.com>

	* pe-dll.c (pe_implied_import_dll): Return early if there is no
	export entries.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 904262fb9f51a910f1e8fcaa9e3c5390480c520b..3a0aa49315d11674e3c4f7e7fce8db5c30dd40cb 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-27  Tristan Gingold  <gingold@adacore.com>
+
+       * pe-dll.c (pe_implied_import_dll): Return early if there is no
+       export entries.
+
 2009-11-26  Nick Clifton  <nickc@redhat.com>
 
        PR ld/10956

diff --git a/ld/pe-dll.c b/ld/pe-dll.c
index beeb580f20380087e19a5e815741fc3bd98743ee..fb94813a875dee3ec90937df4db4e0c4c05345db 100644 (file)
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -2981,7 +2981,7 @@ pe_implied_import_dll (const char *filename)
       return FALSE;
     }
 
-  /* Get pe_header, optional header and numbers of export entries.  */
+  /* Get pe_header, optional header and numbers of directory entries.  */
   pe_header_offset = pe_get32 (dll, 0x3c);
   opthdr_ofs = pe_header_offset + 4 + 20;
 #ifdef pe_use_x86_64
@@ -2990,7 +2990,8 @@ pe_implied_import_dll (const char *filename)
   num_entries = pe_get32 (dll, opthdr_ofs + 92);
 #endif
 
-  if (num_entries < 1) /* No exports.  */
+  /* No import or export directory entry.  */
+  if (num_entries < 1)
     return FALSE;
 
 #ifdef pe_use_x86_64
@@ -3001,6 +3002,10 @@ pe_implied_import_dll (const char *filename)
   export_size = pe_get32 (dll, opthdr_ofs + 100);
 #endif
 
+  /* No export table - nothing to export.  */
+  if (export_size == 0)
+    return FALSE;
+
   nsections = pe_get16 (dll, pe_header_offset + 4 + 2);
   secptr = (pe_header_offset + 4 + 20 +
            pe_get16 (dll, pe_header_offset + 4 + 16));