diff mbox series

NULL dereference read in som_write_object_contents

Message ID Y1yxgzNJg5M48uPI@squeak.grove.modra.org
State Repeat Merge
Headers
Series NULL dereference read in som_write_object_contents |

Checks

Context Check Description
snail/binutils-gdb-check warning Git am fail log

Commit Message

Alan Modra Oct. 29, 2022, 4:52 a.m. UTC 
  objcopy copy_object may omit the call to bfd_copy_private_bfd_data for
various conditions deemed non-fatal, in which case obj_som_exec_data
will be NULL for the output file.

	* som.c (som_finish_writing): Don't dereference NULL
	obj_som_exec_data.
diff mbox series

Patch

diff --git a/bfd/som.c b/bfd/som.c
index b3a72e36ede..7a5ee35f0e2 100644
--- a/bfd/som.c
+++ b/bfd/som.c
@@ -4211,7 +4211,7 @@  som_finish_writing (bfd *abfd)
 
   /* Setting of the system_id has to happen very late now that copying of
      BFD private data happens *after* section contents are set.  */
-  if (abfd->flags & (EXEC_P | DYNAMIC))
+  if ((abfd->flags & (EXEC_P | DYNAMIC)) && obj_som_exec_data (abfd))
     obj_som_file_hdr (abfd)->system_id = obj_som_exec_data (abfd)->system_id;
   else if (bfd_get_mach (abfd) == pa20)
     obj_som_file_hdr (abfd)->system_id = CPU_PA_RISC2_0;
@@ -4242,7 +4242,8 @@  som_finish_writing (bfd *abfd)
 
       exec_header = obj_som_exec_hdr (abfd);
       exec_header->exec_entry = bfd_get_start_address (abfd);
-      exec_header->exec_flags = obj_som_exec_data (abfd)->exec_flags;
+      if (obj_som_exec_data (abfd))
+	exec_header->exec_flags = obj_som_exec_data (abfd)->exec_flags;
 
       /* Oh joys.  Ram some of the BSS data into the DATA section
 	 to be compatible with how the hp linker makes objects