From patchwork Wed Nov 3 19:40:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 47022 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D0C873858D39 for ; Wed, 3 Nov 2021 19:41:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D0C873858D39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1635968476; bh=7ApyL4XBGxmxhMuZA1yjBx/+MiXGlEdKneloeVkDDlU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=CwGGeqTPHUHXZa70YwItj8MRKorzZfqj0HEIxqADziaw+/6pfjgoNyWPkMvLkGLhP zMF4tr3OLT+dDiGUkexBeRhh2ucwjhUXE5cAe3WmuGV6yt7xav9FmJobymT0DNYITK rD/WV2t9tmsygLlwdvfh2FzSh1/9TGx3N8S7o+yo= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) by sourceware.org (Postfix) with ESMTPS id E96D23858D28 for ; Wed, 3 Nov 2021 19:40:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E96D23858D28 Received: by mail-qt1-x82b.google.com with SMTP id h16so2067986qtk.0 for ; Wed, 03 Nov 2021 12:40:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=7ApyL4XBGxmxhMuZA1yjBx/+MiXGlEdKneloeVkDDlU=; b=Zgpj7SZxB0PurvcdZiCXcB1hHhexc9H8U0lJYKk2O5TRlMWLWroIjNcA3xQbCunQZX yf6vOHOp3qaVgfLDEjYZK8HIKk8bIE2Pgf4YPy3xIJSbBvc41fqNik0OHaTpcQVhRTSo W9g8RkaieHRsLflV9SeNbHSUx5z3NYAdrM+T/E9x4KIREFjZLlGOv7Sn4MrqRuvDOOId txK+9bRaBje/zXgw6Qmfh5ihETxchRB6qPad88c6Lx7HdSKx3PJYGz3WaXrLpUa8PPNE Xe/E4g4olsPjrRnH+PHGcob6d/H4jFMmqqGr4QTtuvcqZPTVYdfzZXxYI4qtmFuS48Lt wrfg== X-Gm-Message-State: AOAM530fwdi63sjk50qKmw17NGYOKbBt1lkSSV0av3XF86h8MO/lQPHs FBA2dXPMrm5bBiLqByaf2N8ztibCZdnxCQ== X-Google-Smtp-Source: ABdhPJy4+RxDq6GP4gBRYou9aVXHpzrfWJgx94fOtkzcGDQ0zWdULZz9UNKn6pqFROrRTEZDoSWPTQ== X-Received: by 2002:a05:622a:1d4:: with SMTP id t20mr23064648qtw.127.1635968455062; Wed, 03 Nov 2021 12:40:55 -0700 (PDT) Received: from birita.. ([2804:431:c7cb:b64f:c336:789a:89cc:169]) by smtp.gmail.com with ESMTPSA id m20sm2202862qkp.57.2021.11.03.12.40.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 12:40:54 -0700 (PDT) To: libc-alpha@sourceware.org, Andreas Schwab , Carlos O'Donell Subject: [PATCH] locale: Fix localedata/sort-test undefined behavior Date: Wed, 3 Nov 2021 16:40:51 -0300 Message-Id: <20211103194051.1541716-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The collate-test.c triggers UB with an signed integer overflow, which results in an error on some architectures (powerpc32). Checked on x86_64, i686, and powerpc. --- localedata/collate-test.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/localedata/collate-test.c b/localedata/collate-test.c index 46b91ec57f..09fd5158a7 100644 --- a/localedata/collate-test.c +++ b/localedata/collate-test.c @@ -86,7 +86,7 @@ main (int argc, char *argv[]) srandom (atoi (argv[1])); for (n = 0; n < 10 * nstrings; ++n) { - int r1, r2, r; + int r1, r2; size_t idx1 = random () % nstrings; size_t idx2 = random () % nstrings; struct lines tmp = strings[idx1]; @@ -96,9 +96,10 @@ main (int argc, char *argv[]) /* While we are at it a first little test. */ r1 = strcoll (strings[idx1].key, strings[idx2].key); r2 = strcoll (strings[idx2].key, strings[idx1].key); - r = r1 * r2; - if (r > 0 || (r == 0 && r1 != 0) || (r == 0 && r2 != 0)) + if ((r1 > 0 && r2 > 0) + || ((r1 == 0 || r2 == 0) && r1 != 0) + || ((r1 == 0 || r2 == 0) && r2 != 0)) printf ("`%s' and `%s' collate wrong: %d vs. %d\n", strings[idx1].key, strings[idx2].key, r1, r2); }