PE linker segmentation fault with MALLOC_PERTURB_=1

	PR 24596
	* emultempl/pe.em (gld_${EMULATION_NAME}_after_open): Check that
	the output is coff before accessing coff tdata.
	* emultempl/pep.em (gld_${EMULATION_NAME}_after_open): Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 581be2e4c8d4a8ce4972012e76fdce8de4709890..52d89ecd7a6373f9ad9289a67bd91e13890d50fd 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2019-05-28  Alan Modra  <amodra@gmail.com>
+
+       PR 24596
+       * emultempl/pe.em (gld_${EMULATION_NAME}_after_open): Check that
+       the output is coff before accessing coff tdata.
+       * emultempl/pep.em (gld_${EMULATION_NAME}_after_open): Likewise.
+
 2019-05-28  Szabolcs Nagy  <szabolcs.nagy@arm.com>
 
        * testsuite/ld-aarch64/variant_pcs-now.d: Use --hash-style=sysv.

diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index 10bacbcc870dcf2121d446eeddd94a2fb1c47af2..218f98acf90360053237405400d1d1973b835cc6 100644 (file)
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -1360,7 +1360,8 @@ gld_${EMULATION_NAME}_after_open (void)
      FIXME: This should be done via a function, rather than by
      including an internal BFD header.  */
 
-  if (coff_data (link_info.output_bfd) == NULL
+  if (bfd_get_flavour (link_info.output_bfd) != bfd_target_coff_flavour
+      || coff_data (link_info.output_bfd) == NULL
       || coff_data (link_info.output_bfd)->pe == 0)
     einfo (_("%F%P: cannot perform PE operations on non PE output file '%pB'\n"),
           link_info.output_bfd);

diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em
index c0070c0fbef3f7a7089b08acf07d613877fb2be1..649efaf92c399c8ad473272a8ce8c971fb1b7818 100644 (file)
--- a/ld/emultempl/pep.em
+++ b/ld/emultempl/pep.em
@@ -1348,7 +1348,8 @@ gld_${EMULATION_NAME}_after_open (void)
      FIXME: This should be done via a function, rather than by
      including an internal BFD header.  */
 
-  if (coff_data (link_info.output_bfd) == NULL
+  if (bfd_get_flavour (link_info.output_bfd) != bfd_target_coff_flavour
+      || coff_data (link_info.output_bfd) == NULL
       || coff_data (link_info.output_bfd)->pe == 0)
     einfo (_("%F%P: cannot perform PE operations on non PE output file '%pB'\n"),
           link_info.output_bfd);