From patchwork Thu Nov 4 13:00:31 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: 47047 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 002593857C58 for ; Thu, 4 Nov 2021 13:01:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 002593857C58 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1636030873; bh=eLhq9rrqVCYPbIMccQFXNX6lW0mmsgYCZwK1JwEe+tg=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=jPu2BlZ4X8Qf0I4ErGRoOX5i5Cbd1cmSZ7fyTpyxsWXm7Qt3y6WhYzeOMC+RH2EHZ Q5IIvb3RD9Hf6EKyeiXVEL8zhynLJP7IiYQJsP3IJnfyOoV9JcqsCLoGmER0FI7CQr JhVfxZuQo3gD88SEE1NUFDrW1nPwiFFTRw75X7hE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) by sourceware.org (Postfix) with ESMTPS id 86CA4385803D for ; Thu, 4 Nov 2021 13:00:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 86CA4385803D Received: by mail-qv1-xf2a.google.com with SMTP id k29so5175869qve.6 for ; Thu, 04 Nov 2021 06:00:36 -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:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eLhq9rrqVCYPbIMccQFXNX6lW0mmsgYCZwK1JwEe+tg=; b=S7rldn+nOW3jHpNuUnaJIXkEEUN2bnNat3dVg7yngXOdF9R1sjlp1oUJJfoDxXzDc0 HSIEjUbFciVvYU5A59G99CVYQoVVp4rVomJw5B7JeloYDTMyvK3CNZ3RE+b5xUtMvGTV SxwXoYdYc4beE9UxSFqtixzqtcqdbUQA+nYR6BeTVWTCxhUyYSHygG8HSqzQUatO4V0q 77bGEDDe3TQ7+nrGD8pTiSh69fcfPhBWmovR9sf/NW6Xpk99wN32B7/6rdbGsIQhBlsS mpK9qSkTHbuesew/k2RlSYjTtzmUgWPCOGrKoOPn4l5ssj2N/iwNqXiA5BFt/wW4ntnT cMbw== X-Gm-Message-State: AOAM531uAHAYb+/AJgXP/fS/6S4ANQAL3pdZ0EdoxWXFF4fL0jCUPqD/ GhwdkmHheYcA8/dSzm+fM7ExwWiiVsseAw== X-Google-Smtp-Source: ABdhPJzk/kQaI0kbwUIT56+ipKwRPGXLlOU7WI/tJA+7uv+hjhwxLatTsp4VXSgJo1oVK1SiAeYVuw== X-Received: by 2002:a05:6214:e46:: with SMTP id o6mr49015097qvc.55.1636030835767; Thu, 04 Nov 2021 06:00:35 -0700 (PDT) Received: from birita.. ([2804:431:c7cb:b64f:4cb2:18f:d2ae:b202]) by smtp.gmail.com with ESMTPSA id e14sm3922935qty.59.2021.11.04.06.00.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Nov 2021 06:00:35 -0700 (PDT) To: libc-alpha@sourceware.org, Paul Eggert Subject: [PATCH v2] locale: Fix localedata/sort-test undefined behavior Date: Thu, 4 Nov 2021 10:00:31 -0300 Message-Id: <20211104130031.185958-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Spam-Status: No, score=-12.9 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 Cc: Andreas Schwab 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 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/localedata/collate-test.c b/localedata/collate-test.c index 46b91ec57f..e6ca7e8e8b 100644 --- a/localedata/collate-test.c +++ b/localedata/collate-test.c @@ -32,6 +32,11 @@ 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 +91,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 +101,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); }