PE linker segmentation fault with MALLOC_PERTURB_=1

Message ID 20190528111652.GV6820@bubble.grove.modra.org
State New
Headers show
Series
  • PE linker segmentation fault with MALLOC_PERTURB_=1
Related show

Commit Message

Alan Modra May 28, 2019, 11:16 a.m.
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.


-- 
Alan Modra
Australia Development Lab, IBM

Patch

diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index 10bacbcc87..218f98acf9 100644
--- 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 c0070c0fbe..649efaf92c 100644
--- 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);