From: Alan Modra <amodra@gmail.com>
Date: Mon, 29 Jul 2024 04:55:07 +0000 (+0930)
Subject: PR32032 dwp segfaults on hello world binary
X-Git-Tag: gdb-16-branchpoint~1301
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=972092a9eda941a5744125f79fe58e52fb7007e4;p=thirdparty%2Fbinutils-gdb.git

PR32032 dwp segfaults on hello world binary

Fixing the segfault is easy with this bandaid, but further work is
needed to teach dwp about DW_AT_dwo_name and dwo id in the cu header.
At the moment dwp only handles DW_AT_GNU_dwo_name and DW_AT_GNU_dwo_id.

	PR 32032
	* dwp.cc (Dwp_output_file::finalize): Return immediately on
	no output file.
---

diff --git a/gold/dwp.cc b/gold/dwp.cc
index e1656d0650d..584892c2b0c 100644
--- a/gold/dwp.cc
+++ b/gold/dwp.cc
@@ -1838,6 +1838,9 @@ Dwp_output_file::finalize()
 {
   unsigned char* buf;
 
+  if (this->fd_ == NULL)
+    return;
+
   // Write the accumulated output sections.
   for (unsigned int i = 0; i < this->sections_.size(); i++)
     {
@@ -1919,11 +1922,8 @@ Dwp_output_file::finalize()
   this->write_ehdr();
 
   // Close the file.
-  if (this->fd_ != NULL)
-    {
-      if (::fclose(this->fd_) != 0)
-	gold_fatal(_("%s: %s"), this->name_, strerror(errno));
-    }
+  if (::fclose(this->fd_) != 0)
+    gold_fatal(_("%s: %s"), this->name_, strerror(errno));
   this->fd_ = NULL;
 }