[binutils-gdb] PR32032 dwp segfaults on hello world binary

[binutils-gdb] PR32032 dwp segfaults on hello world binary

[Alan Modra]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=972092a9eda941a5744125f79fe58e52fb7007e4

commit 972092a9eda941a5744125f79fe58e52fb7007e4
Author: Alan Modra <amodra@gmail.com>
Date:   Mon Jul 29 14:25:07 2024 +0930

    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:
---
 gold/dwp.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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;
 }