From a14413ddff3009418711b9f78a7d3dc7ac10dab0 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 12 Jul 2022 11:17:38 +0930 Subject: [PATCH] PowerPC md_end: Don't htab_delete(NULL) It might be possible to hit md_end before md_begin is called, don't segfault if so. Also, remove a useless check. * gas/config/tc-ppc.c (insn_calloc): Remove needless overflow check. (ppc_md_end): Check ppc_hash before deleting. Clear ppc_hash. --- 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 = obstack_alloc (&insn_obstack, amt); + size_t amt = n * size; + void *ret = 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 = NULL; } void -- 2.30.2