[binutils-gdb/binutils-2_43-branch] segv in bfd_elf_get_str_section

[Alan Modra]

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

commit 95ed7cf1be25d86ca455b09ffee4f129f1857f1d
Author: Alan Modra <amodra@gmail.com>
Date:   Tue Oct 1 07:53:55 2024 +0930

    segv in bfd_elf_get_str_section
    
    Attempting to write a termination NUL to PROT_READ mmap'd memory was
    a silly idea.
    
            PR 32109
            * elf.c (bfd_elf_get_str_section): Don't write terminating NUL
            if missing.
            * libbfd.c (_bfd_munmap_readonly_temporary): Correct comment.
    
    (cherry picked from commit 656f8fbaae34cb37bda5110cbc8c79c6a2aaa847)

Diff:
---
 bfd/elf.c    | 3 ++-
 bfd/libbfd.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bfd/elf.c b/bfd/elf.c
index 389c1560d81..b02d95579b7 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -301,7 +301,8 @@ bfd_elf_get_str_section (bfd *abfd, unsigned int shindex)
 	  _bfd_error_handler
 	    /* xgettext:c-format */
 	    (_("%pB: string table [%u] is corrupt"), abfd, shindex);
-	  shstrtab[shstrtabsize - 1] = 0;
+	  shstrtab = NULL;
+	  i_shdrp[shindex]->sh_size = 0;
 	}
       i_shdrp[shindex]->contents = shstrtab;
     }
diff --git a/bfd/libbfd.c b/bfd/libbfd.c
index 53868471001..4da842ead84 100644
--- a/bfd/libbfd.c
+++ b/bfd/libbfd.c
@@ -1126,7 +1126,7 @@ _bfd_munmap_readonly_temporary (void *ptr, size_t rsize)
 {
   /* NB: Since _bfd_munmap_readonly_temporary is called like free, PTR
      may be NULL.  Otherwise, PTR and RSIZE must be valid.  If RSIZE is
-     0, _bfd_malloc_and_read is called.  */
+     0, free is called.  */
   if (ptr == NULL)
     return;
   if (rsize != 0)