From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS22989 209.51.188.0/24 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 504241F5AE for ; Sun, 25 Apr 2021 01:19:26 +0000 (UTC) Received: from localhost ([::1]:41720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1laTQj-0008Rb-6a for normalperson@yhbt.net; Sat, 24 Apr 2021 21:19:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50474) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1laTQc-0008RL-Tn for bug-gnulib@gnu.org; Sat, 24 Apr 2021 21:19:19 -0400 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:47294) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1laTQb-0006nK-9H for bug-gnulib@gnu.org; Sat, 24 Apr 2021 21:19:18 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 4B77F1600B2 for ; Sat, 24 Apr 2021 18:19:16 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 90ivYm02gwTc; Sat, 24 Apr 2021 18:19:15 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 497D21600A7; Sat, 24 Apr 2021 18:19:15 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id w4qXZnGsygI4; Sat, 24 Apr 2021 18:19:15 -0700 (PDT) Received: from day.example.com (cpe-172-91-119-151.socal.res.rr.com [172.91.119.151]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id E8993160099; Sat, 24 Apr 2021 18:19:14 -0700 (PDT) From: Paul Eggert To: bug-gnulib@gnu.org Subject: [PATCH] Fix messed-up previous patch Date: Sat, 24 Apr 2021 18:19:11 -0700 Message-Id: <20210425011911.339393-1-eggert@cs.ucla.edu> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=131.179.128.68; envelope-from=eggert@cs.ucla.edu; helo=zimbra.cs.ucla.edu X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Eggert Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: "bug-gnulib" --- ChangeLog | 2 ++ lib/malloca.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f91f2e3df..3a21db4f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ PTRDIFF_MAX. * lib/xalloc-oversized.h: Adjust comment to match. =20 + xmalloca, etc.: fix some xalloc-oversized issues + * lib/malloca.h (nmalloca): * lib/xmalloca.h (xnmalloca): Convert S to ptrdiff_t to avoid arithmetic overflow if N and S are both narrower than ptrdiff_t. * lib/xalloc-oversized.h (xalloc_oversized): diff --git a/lib/malloca.h b/lib/malloca.h index f9b30880d..a255e3f04 100644 --- a/lib/malloca.h +++ b/lib/malloca.h @@ -79,7 +79,7 @@ extern void freea (void *p); on the stack. S must be positive and N must be nonnegative. The array must be freed using freea() before the function returns. *= / #define nmalloca(n, s) \ - (xalloc_oversized (n, s) ? NULL : malloca ((n) * (ptrdiff_t) (s))) + (xalloc_oversized (n, s) ? NULL : malloca ((n) * (size_t) (s))) =20 =20 #ifdef __cplusplus --=20 2.27.0