From patchwork Mon Nov 8 18:29:52 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: 1552475 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=J2xoZEFG; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hp05y1DGcz9s0r for ; Tue, 9 Nov 2021 05:30:14 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 80D5C3858423 for ; Mon, 8 Nov 2021 18:30:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 80D5C3858423 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1636396211; bh=pKujI+sX5yESb7gzgJrq1aAwqP0xD8Mr5qwwujW/PFw=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=J2xoZEFG5shscTc0VAyuUXVnu+ayqRf/xTDtOYI0Dn+7zZalT3uNLeuPpF1M6e7RL 7uQSSMXFcbgfBwpsm4KEu0eUB45AkSaf5gOFxXOYrqf56eEkDfy1blEO3NobPZIP/W IdgTMP0/BBFmdAwfKSlIxfORl0koFMqvBfPWv0DM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x22e.google.com (mail-oi1-x22e.google.com [IPv6:2607:f8b0:4864:20::22e]) by sourceware.org (Postfix) with ESMTPS id 19D023858D3C for ; Mon, 8 Nov 2021 18:29:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 19D023858D3C Received: by mail-oi1-x22e.google.com with SMTP id u2so28971848oiu.12 for ; Mon, 08 Nov 2021 10:29:57 -0800 (PST) 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=pKujI+sX5yESb7gzgJrq1aAwqP0xD8Mr5qwwujW/PFw=; b=oPsLRTYjcgUhMfisuFnkD16l/fXZnrykljXDSiD3Q5pb8sLFLt7CEVFfl+5B3WFGCj cg6e+WtKeq+XNR0hMG19Ch12Aim6oxoYZ16NzjkqN/wMnjrORSfADsTOejd7MamcZqhh 8LD6UJP9TgCSWEAVMvtUyE3jj9fYSFv/iby9zv84fxAhYDgSd2BTddPljeB5j17gRHzL Hp111wZhsB0AKI5coPng0TQ6/fuEJIYc+aEfOp0v+q/NnuCdpZimze+BiwtJvJ8LcfzJ K5gZbJC+uFAoJquQGjFcj9d6vMBSgsr3ifUFdbC6j+wArD8Hexfuc+2/iYGE3C2jk38I OJMg== X-Gm-Message-State: AOAM531Bmed5fiwe9UH+qWee7dz+FZrKuMAcasvcTZggXCnrQjGf223T wh7YtHbc7xeAW6F1N/CNfxkS/6SC1luDJg== X-Google-Smtp-Source: ABdhPJyC1WSFCEY7Mae28ypgIqAQowZ76UHyiO2sTr8ZW2igY1fq6Zlk0/l8c0B3CN9iSe6DPPmgIg== X-Received: by 2002:a05:6808:2395:: with SMTP id bp21mr322210oib.78.1636396196348; Mon, 08 Nov 2021 10:29:56 -0800 (PST) Received: from birita.. ([2804:431:c7cb:55a:c067:29b:4c08:be99]) by smtp.gmail.com with ESMTPSA id 111sm3262089otu.55.2021.11.08.10.29.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 10:29:56 -0800 (PST) To: libc-alpha@sourceware.org, Paul Eggert , "H . J . Lu" Subject: [PATCH v3] locale: Fix localedata/sort-test undefined behavior Date: Mon, 8 Nov 2021 15:29:52 -0300 Message-Id: <20211108182952.1004707-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Spam-Status: No, score=-12.2 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+incoming=patchwork.ozlabs.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 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/localedata/collate-test.c b/localedata/collate-test.c index 46b91ec57f..f962332517 100644 --- a/localedata/collate-test.c +++ b/localedata/collate-test.c @@ -32,6 +32,12 @@ struct lines static int xstrcoll (const void *, const void *); +static int +signum (int n) +{ + return (0 < n) - (n < 0); +} + int main (int argc, char *argv[]) { @@ -86,7 +92,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 +102,8 @@ 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 (signum (r1) != - signum (r2)) printf ("`%s' and `%s' collate wrong: %d vs. %d\n", strings[idx1].key, strings[idx2].key, r1, r2); }