PR17074 - ignore line terminator characters found inside strings.

[deliverable/binutils-gdb.git] / bfd / peicode.h

diff --git a/bfd/peicode.h b/bfd/peicode.h
index 77e8d680a386f7a7c1ca8497bfe195b378463de0..0183f98ca5c40e1d0188f8a708dab01bf843b90c 100644 (file)
--- a/bfd/peicode.h
+++ b/bfd/peicode.h
@@ -52,11 +52,15 @@ Most of this hacked by  Steve Chamberlain,
    wasting too much time.
 */
 
-#ifdef  coff_bfd_print_private_bfd_data
-static  boolean (* pe_saved_coff_bfd_print_private_bfd_data) (bfd *, PTR) = coff_bfd_print_private_bfd_data;
-#undef  coff_bfd_print_private_bfd_data
+#ifdef coff_bfd_print_private_bfd_data
+static boolean (*pe_saved_coff_bfd_print_private_bfd_data)
+     PARAMS ((bfd *, PTR))
+     = coff_bfd_print_private_bfd_data;
+#undef coff_bfd_print_private_bfd_data
 #else
-static  boolean (* pe_saved_coff_bfd_print_private_bfd_data) (bfd *, PTR) = NULL;
+static boolean (*pe_saved_coff_bfd_print_private_bfd_data)
+     PARAMS ((bfd *, PTR))
+     = NULL;
 #endif
 #define coff_bfd_print_private_bfd_data pe_print_private_bfd_data
 
@@ -853,7 +857,9 @@ static void add_data_entry (abfd, aout, idx, name, base)
   asection *sec = bfd_get_section_by_name (abfd, name);
 
   /* add import directory information if it exists */
-  if (sec != NULL)
+  if (sec != NULL
+      && coff_section_data (abfd, sec) != NULL
+      && pei_section_data (abfd, sec) != NULL)
     {
       aout->DataDirectory[idx].VirtualAddress = (sec->vma - base) & 0xffffffff;
       aout->DataDirectory[idx].Size = pei_section_data (abfd, sec)->virt_size;
@@ -1205,20 +1211,20 @@ static char * dir_names[IMAGE_NUMBEROF_DIRECTORY_ENTRIES] =
 {
   N_ ("Export Directory [.edata (or where ever we found it)]"),
   N_ ("Import Directory [parts of .idata]"),
-  _("Resource Directory [.rsrc]"),
-  _("Exception Directory [.pdata]"),
-  _("Security Directory"),
-  _("Base Relocation Directory [.reloc]"),
-  _("Debug Directory"),
-  _("Description Directory"),
-  _("Special Directory"),
-  _("Thread Storage Directory [.tls]"),
-  _("Load Configuration Directory"),
-  _("Bound Import Directory"),
-  _("Import Address Table Directory"),
-  _("Reserved"),
-  _("Reserved"),
-  _("Reserved")
+  N_ ("Resource Directory [.rsrc]"),
+  N_ ("Exception Directory [.pdata]"),
+  N_ ("Security Directory"),
+  N_ ("Base Relocation Directory [.reloc]"),
+  N_ ("Debug Directory"),
+  N_ ("Description Directory"),
+  N_ ("Special Directory"),
+  N_ ("Thread Storage Directory [.tls]"),
+  N_ ("Load Configuration Directory"),
+  N_ ("Bound Import Directory"),
+  N_ ("Import Address Table Directory"),
+  N_ ("Reserved"),
+  N_ ("Reserved"),
+  N_ ("Reserved")
 };
 
 /**********************************************************************/
@@ -2054,11 +2060,15 @@ pe_mkobject_hook (abfd, filehdr, aouthdr)
 /* Copy any private info we understand from the input bfd
    to the output bfd.  */
 
-#ifdef  coff_bfd_copy_private_bfd_data
-static  boolean (* pe_saved_coff_bfd_copy_private_bfd_data)(bfd *, bfd *) = coff_bfd_copy_private_bfd_data;
-#undef  coff_bfd_copy_private_bfd_data
+#ifdef coff_bfd_copy_private_bfd_data
+static boolean (*pe_saved_coff_bfd_copy_private_bfd_data)
+     PARAMS ((bfd *, bfd *))
+     = coff_bfd_copy_private_bfd_data;
+#undef coff_bfd_copy_private_bfd_data
 #else
-static  boolean (* pe_saved_coff_bfd_copy_private_bfd_data)(bfd *, bfd *) = NULL;
+static boolean (*pe_saved_coff_bfd_copy_private_bfd_data)
+     PARAMS ((bfd *, bfd *))
+     = NULL;
 #endif
 #define coff_bfd_copy_private_bfd_data pe_bfd_copy_private_bfd_data