From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <amodra@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1062)
 id AAC8B38316D5; Tue, 12 Jul 2022 02:35:54 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AAC8B38316D5
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Alan Modra <amodra@sourceware.org>
To: bfd-cvs@sourceware.org
Subject: [binutils-gdb] PowerPC md_end: Don't htab_delete(NULL)
X-Act-Checkin: binutils-gdb
X-Git-Author: Alan Modra <amodra@gmail.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 35c5dcc666082f0edf6dd559e46b98d0e7986a2e
X-Git-Newrev: a14413ddff3009418711b9f78a7d3dc7ac10dab0
Message-Id: <20220712023554.AAC8B38316D5@sourceware.org>
Date: Tue, 12 Jul 2022 02:35:54 +0000 (GMT)
X-BeenThere: binutils-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Binutils-cvs mailing list <binutils-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/binutils-cvs>,
 <mailto:binutils-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/binutils-cvs/>
List-Help: <mailto:binutils-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/binutils-cvs>,
 <mailto:binutils-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Jul 2022 02:35:54 -0000

https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Da14413ddff30=
09418711b9f78a7d3dc7ac10dab0

commit a14413ddff3009418711b9f78a7d3dc7ac10dab0
Author: Alan Modra <amodra@gmail.com>
Date:   Tue Jul 12 11:17:38 2022 +0930

    PowerPC md_end: Don't htab_delete(NULL)
   =20
    It might be possible to hit md_end before md_begin is called, don't
    segfault if so.  Also, remove a useless check.
   =20
            * gas/config/tc-ppc.c (insn_calloc): Remove needless overflow
            check.
            (ppc_md_end): Check ppc_hash before deleting.  Clear ppc_hash.

Diff:
---
 gas/config/tc-ppc.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index ac61cd8f122..5015777d600 100644
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -1620,14 +1620,8 @@ insn_validate (const struct powerpc_opcode *op)
 static void *
 insn_calloc (size_t n, size_t size)
 {
-  size_t amt;
-  void *ret;
-  if (gas_mul_overflow (n, size, &amt))
-    {
-      obstack_alloc_failed_handler ();
-      abort ();
-    }
-  ret =3D obstack_alloc (&insn_obstack, amt);
+  size_t amt =3D n * size;
+  void *ret =3D obstack_alloc (&insn_obstack, amt);
   memset (ret, 0, amt);
   return ret;
 }
@@ -1903,8 +1897,12 @@ md_begin (void)
 void
 ppc_md_end (void)
 {
-  htab_delete (ppc_hash);
-  _obstack_free (&insn_obstack, NULL);
+  if (ppc_hash)
+    {
+      htab_delete (ppc_hash);
+      _obstack_free (&insn_obstack, NULL);
+    }
+  ppc_hash =3D NULL;
 }
=20
 void