From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by sourceware.org (Postfix) with ESMTPS id 325E03858290 for ; Tue, 12 Jul 2022 02:34:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 325E03858290 Received: by mail-pg1-x534.google.com with SMTP id g4so6394182pgc.1 for ; Mon, 11 Jul 2022 19:34:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition; bh=90cit9WwC0qmVbXI7YabT42f+TrcObavsaHO4KoAacc=; b=RrsASn5wTw0Q7JUEzxToOwh2AtzZP3BnzNGbjDKDuuFfoQOHlrYTMNNX8QeoMTBVs0 EQmsYvLC7afO+RYBYtu2vHZLKzZD9MAkeTuR6sIKhGoXA3RZlCyR/uSSsC1Ve/Qk/8tN svQuHefrGy66qnXYKZVnu1KKXQwLDfTFSSMbzSF4K6xQbV7KnWDzZBqXwqFnfPrd/zQK DLg9HzOwvOtzGGk3uN1Ji47ayHxvfskHznglatFydshXF5O61PuplJdl3Ya1WHqBHGRw Lov2P4CQxzO4CXdNTPGeoB3O46lszPoYXmv+sE8hUV0a3ekqdxp0SThVDgSLEUJ20keQ NZsg== X-Gm-Message-State: AJIora/9PN+stZvSd9DwjqhNDPoNMCPgMnmUS6CKxincUAjLhU+1Y7k/ OacfT4tKX+PNrsxSvNaQ1TpeOG5tChg= X-Google-Smtp-Source: AGRyM1srPXfDFR0ZjBJvPeD9JiK20nGmXUHW3wy39nUF5nFa24Pjk1+V2RFGyTI0MZ451VALmnFq5w== X-Received: by 2002:a63:6c81:0:b0:3fd:4be3:8ee9 with SMTP id h123-20020a636c81000000b003fd4be38ee9mr17893067pgc.188.1657593286006; Mon, 11 Jul 2022 19:34:46 -0700 (PDT) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:be9c:f7f:7577:a1f7]) by smtp.gmail.com with ESMTPSA id c4-20020a056a00008400b005251b9102dbsm5631015pfj.144.2022.07.11.19.34.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jul 2022 19:34:45 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 4262C1143044; Tue, 12 Jul 2022 12:04:43 +0930 (ACST) Date: Tue, 12 Jul 2022 12:04:43 +0930 From: Alan Modra To: binutils@sourceware.org Subject: PowerPC md_end: Don't htab_delete(NULL) Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3036.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2022 02:34:48 -0000 It might be possible to hit md_end before md_begin is called, don't segfault if so. Also, remove a useless check in insn_calloc. * gas/config/tc-ppc.c (insn_calloc): Remove needless overflow check. (ppc_md_end): Check ppc_hash before deleting. Clear ppc_hash. 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 -- Alan Modra Australia Development Lab, IBM