PR31162, Memory Leak in ldwrite.c

Message ID ZYA3zY4ZcFOk9MWT@squeak.grove.modra.org
State New
Headers
Series PR31162, Memory Leak in ldwrite.c |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_binutils_build--master-arm warning Patch is already merged
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64 warning Patch is already merged

Commit Message

Alan Modra Dec. 18, 2023, 12:15 p.m. UTC
  This isn't a particularly worrying memory leak, but fix it anyway.

	PR 31162
	* ldwrite.c (build_link_order): Use bfd_alloc rather than xmalloc.
	Add %E to error messages.
  

Patch

diff --git a/ld/ldwrite.c b/ld/ldwrite.c
index 0e9d7d0a3df..9375644cbd1 100644
--- a/ld/ldwrite.c
+++ b/ld/ldwrite.c
@@ -57,11 +57,14 @@  build_link_order (lang_statement_union_type *statement)
 
 	link_order = bfd_new_link_order (link_info.output_bfd, output_section);
 	if (link_order == NULL)
-	  einfo (_("%F%P: bfd_new_link_order failed\n"));
+	  einfo (_("%F%P: bfd_new_link_order failed: %E\n"));
 
 	link_order->type = bfd_data_link_order;
 	link_order->offset = statement->data_statement.output_offset;
-	link_order->u.data.contents = (bfd_byte *) xmalloc (QUAD_SIZE);
+	link_order->u.data.contents = bfd_alloc (link_info.output_bfd,
+						 QUAD_SIZE);
+	if (link_order->u.data.contents == NULL)
+	  einfo (_("%F%P: bfd_new_link_order failed: %E\n"));
 
 	value = statement->data_statement.value;
 
@@ -167,13 +170,15 @@  build_link_order (lang_statement_union_type *statement)
 
 	link_order = bfd_new_link_order (link_info.output_bfd, output_section);
 	if (link_order == NULL)
-	  einfo (_("%F%P: bfd_new_link_order failed\n"));
+	  einfo (_("%F%P: bfd_new_link_order failed: %E\n"));
 
 	link_order->offset = rs->output_offset;
 	link_order->size = bfd_get_reloc_size (rs->howto);
 
 	link_order->u.reloc.p = (struct bfd_link_order_reloc *)
-	  xmalloc (sizeof (struct bfd_link_order_reloc));
+	  bfd_alloc (link_info.output_bfd, sizeof (struct bfd_link_order_reloc));
+	if (link_order->u.reloc.p == NULL)
+	  einfo (_("%F%P: bfd_new_link_order failed: %E\n"));
 
 	link_order->u.reloc.p->reloc = rs->reloc;
 	link_order->u.reloc.p->addend = rs->addend_value;
@@ -219,7 +224,7 @@  build_link_order (lang_statement_union_type *statement)
 	    link_order = bfd_new_link_order (link_info.output_bfd,
 					     output_section);
 	    if (link_order == NULL)
-	      einfo (_("%F%P: bfd_new_link_order failed\n"));
+	      einfo (_("%F%P: bfd_new_link_order failed: %E\n"));
 
 	    if ((i->flags & SEC_NEVER_LOAD) != 0
 		&& (i->flags & SEC_DEBUGGING) == 0)
@@ -260,7 +265,7 @@  build_link_order (lang_statement_union_type *statement)
 	link_order = bfd_new_link_order (link_info.output_bfd,
 					 output_section);
 	if (link_order == NULL)
-	  einfo (_("%F%P: bfd_new_link_order failed\n"));
+	  einfo (_("%F%P: bfd_new_link_order failed: %E\n"));
 	link_order->type = bfd_data_link_order;
 	link_order->size = statement->padding_statement.size;
 	link_order->offset = statement->padding_statement.output_offset;