From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x533.google.com (mail-pg1-x533.google.com [IPv6:2607:f8b0:4864:20::533]) by sourceware.org (Postfix) with ESMTPS id 5D11B383543D for ; Mon, 10 Jan 2022 00:37:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5D11B383543D Received: by mail-pg1-x533.google.com with SMTP id i8so9754913pgt.13 for ; Sun, 09 Jan 2022 16:37:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Ni18fRQcMPpsxzk4im0aAzod40RBZeEPJCSlywQeu40=; b=kDRtSOXzSo4S+jaJI4c7K6En0mv+cSR4yQcr6WZoFiajU4z5rAC6bMH0wqdoL4Kzbw ETUm72IxUEl/p4pIXjalUMpRZrTkBoEauQrHBSMyrJplNWesJBYrJiLgqMoTtYhHOJW0 6uOW7y/HJ1hWHYm6EO7pY6GOKYuwA6I8MjdeSEjTJn4F9HLdZkRGDDZh01+Hzx3AuKjv AKX3lS4sj76knIu91DajCVK/WFW5nKrd+vL/D5LXzBgaJOP2SpyaTY8di6cmbuqCy5ey 7YLnUCb1SYXXbQHIi4nGMntLBDNk94k8kUS8zhR7z74pQnqdnGU3fMOOHAdPy5vloTnm hUKQ== X-Gm-Message-State: AOAM532BOnf+nNjLli28WajzRDwwzOxJchdRye88bid951xocEoRLOZf lFlQu8jo68Vfep15yuOd2eeYjXZnHSz+KEoESbQ= X-Google-Smtp-Source: ABdhPJwaMmlFD+TFPjAWMrHMqWQrm7qqjw2ATz2PiRTQ4dsK8DcYhgvMjOynTfIGe131UoNT1zcAOTDqknEDnLuBqes= X-Received: by 2002:a63:e50b:: with SMTP id r11mr63449251pgh.210.1641775067438; Sun, 09 Jan 2022 16:37:47 -0800 (PST) MIME-Version: 1.0 References: <20220109122946.2754917-1-goldstein.w.n@gmail.com> <20220110002746.3653516-1-goldstein.w.n@gmail.com> <20220110002746.3653516-3-goldstein.w.n@gmail.com> In-Reply-To: <20220110002746.3653516-3-goldstein.w.n@gmail.com> From: "H.J. Lu" Date: Sun, 9 Jan 2022 16:37:11 -0800 Message-ID: Subject: Re: [PATCH v2 3/7] string/test-str*cmp: remove stupid_[strcmp, strncmp, wcscmp, wcsncmp]. To: Noah Goldstein Cc: GNU C Library Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3028.0 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 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-List-Received-Date: Mon, 10 Jan 2022 00:37:51 -0000 On Sun, Jan 9, 2022 at 4:29 PM Noah Goldstein via Libc-alpha wrote: > > These implementations are incorrect. There may be a mismatch in s1/s2 > before invalid memory but no null CHAR / length boundary. > > Signed-off-by: Noah Goldstein > --- > string/test-strcmp.c | 35 ----------------------------------- > string/test-strncmp.c | 34 ---------------------------------- > 2 files changed, 69 deletions(-) > > diff --git a/string/test-strcmp.c b/string/test-strcmp.c > index 3c75076fb8..97d7bf5043 100644 > --- a/string/test-strcmp.c > +++ b/string/test-strcmp.c > @@ -34,7 +34,6 @@ > # define STRLEN wcslen > # define MEMCPY wmemcpy > # define SIMPLE_STRCMP simple_wcscmp > -# define STUPID_STRCMP stupid_wcscmp > # define CHAR wchar_t > # define UCHAR wchar_t > # define CHARBYTES 4 > @@ -64,25 +63,6 @@ simple_wcscmp (const wchar_t *s1, const wchar_t *s2) > return c1 < c2 ? -1 : 1; > } > > -int > -stupid_wcscmp (const wchar_t *s1, const wchar_t *s2) > -{ > - size_t ns1 = wcslen (s1) + 1; > - size_t ns2 = wcslen (s2) + 1; > - size_t n = ns1 < ns2 ? ns1 : ns2; > - int ret = 0; > - > - wchar_t c1, c2; > - > - while (n--) { > - c1 = *s1++; > - c2 = *s2++; > - if ((ret = c1 < c2 ? -1 : c1 == c2 ? 0 : 1) != 0) > - break; > - } > - return ret; > -} > - > #else > # include > > @@ -92,7 +72,6 @@ stupid_wcscmp (const wchar_t *s1, const wchar_t *s2) > # define STRLEN strlen > # define MEMCPY memcpy > # define SIMPLE_STRCMP simple_strcmp > -# define STUPID_STRCMP stupid_strcmp > # define CHAR char > # define UCHAR unsigned char > # define CHARBYTES 1 > @@ -113,24 +92,10 @@ simple_strcmp (const char *s1, const char *s2) > return ret; > } > > -int > -stupid_strcmp (const char *s1, const char *s2) > -{ > - size_t ns1 = strlen (s1) + 1; > - size_t ns2 = strlen (s2) + 1; > - size_t n = ns1 < ns2 ? ns1 : ns2; > - int ret = 0; > - > - while (n--) > - if ((ret = *(unsigned char *) s1++ - *(unsigned char *) s2++) != 0) > - break; > - return ret; > -} > #endif > > typedef int (*proto_t) (const CHAR *, const CHAR *); > > -IMPL (STUPID_STRCMP, 1) > IMPL (SIMPLE_STRCMP, 1) > IMPL (STRCMP, 1) > > diff --git a/string/test-strncmp.c b/string/test-strncmp.c > index e7d5edea39..61a283a0af 100644 > --- a/string/test-strncmp.c > +++ b/string/test-strncmp.c > @@ -33,7 +33,6 @@ > # define STRDUP wcsdup > # define MEMCPY wmemcpy > # define SIMPLE_STRNCMP simple_wcsncmp > -# define STUPID_STRNCMP stupid_wcsncmp > # define CHAR wchar_t > # define UCHAR wchar_t > # define CHARBYTES 4 > @@ -57,25 +56,6 @@ simple_wcsncmp (const CHAR *s1, const CHAR *s2, size_t n) > return 0; > } > > -int > -stupid_wcsncmp (const CHAR *s1, const CHAR *s2, size_t n) > -{ > - wchar_t c1, c2; > - size_t ns1 = wcsnlen (s1, n) + 1, ns2 = wcsnlen (s2, n) + 1; > - > - n = ns1 < n ? ns1 : n; > - n = ns2 < n ? ns2 : n; > - > - while (n--) > - { > - c1 = *s1++; > - c2 = *s2++; > - if (c1 != c2) > - return c1 > c2 ? 1 : -1; > - } > - return 0; > -} > - > #else > # define L(str) str > # define STRNCMP strncmp > @@ -83,7 +63,6 @@ stupid_wcsncmp (const CHAR *s1, const CHAR *s2, size_t n) > # define STRDUP strdup > # define MEMCPY memcpy > # define SIMPLE_STRNCMP simple_strncmp > -# define STUPID_STRNCMP stupid_strncmp > # define CHAR char > # define UCHAR unsigned char > # define CHARBYTES 1 > @@ -101,23 +80,10 @@ simple_strncmp (const char *s1, const char *s2, size_t n) > return ret; > } > > -int > -stupid_strncmp (const char *s1, const char *s2, size_t n) > -{ > - size_t ns1 = strnlen (s1, n) + 1, ns2 = strnlen (s2, n) + 1; > - int ret = 0; > - > - n = ns1 < n ? ns1 : n; > - n = ns2 < n ? ns2 : n; > - while (n-- && (ret = *(unsigned char *) s1++ - * (unsigned char *) s2++) == 0); > - return ret; > -} > - > #endif > > typedef int (*proto_t) (const CHAR *, const CHAR *, size_t); > > -IMPL (STUPID_STRNCMP, 0) > IMPL (SIMPLE_STRNCMP, 0) > IMPL (STRNCMP, 1) > > -- > 2.25.1 > LGTM. Reviewed-by: H.J. Lu Thanks. -- H.J.