From patchwork Mon Sep 4 14:56:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Tirta Halim X-Patchwork-Id: 75223 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 55CA9385842A for ; Mon, 4 Sep 2023 14:59:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 55CA9385842A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1693839577; bh=2bjda2KLZOMYph8X+HYe3YNWDvIjl3VUtBNBZjkNI6g=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=G4u2cGWINl1rzDv4LFiLHZN7EKl+Kfx55iCmHzU+9MCcyLCu/hKFnCroQVdSnGBmU 1adfOJT13+J/DvqG1lFkZ4061SWxmM+FDeHsgyFODW9Ar4xShlieRaJn8zQUZXXu99 1RaQJLmUk4L7RJnLUhKYELehLiUrArNlXucxsyP4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by sourceware.org (Postfix) with ESMTPS id 4F7C93858C30 for ; Mon, 4 Sep 2023 14:59:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4F7C93858C30 Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-56f84de64b9so912572a12.1 for ; Mon, 04 Sep 2023 07:59:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693839552; x=1694444352; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2bjda2KLZOMYph8X+HYe3YNWDvIjl3VUtBNBZjkNI6g=; b=Fn7q4a2lkPFhtbE3W0xhU3yBVFlC0YbUIYeJT2vfp4A9JLuFjSnIQ7ur2dePZfukZV bfpM35CS2BxoD8GZ6csJBOMeMUm0VsMXf8hjE+gf4t01HL4nsN5mNN8xo9bIPzVy+7aN apwEgl/fUF7WOfEdSf9i+oIarkLRAbOZGJOC+MXbLBFu3s9ZvT5wsdiAtJgifM/7IZhf Afq6swE7+DhnYp1r8TAaokaY5Mg4VHxMqqs+thb5NTtrpnRsDzPS8kaosjl5BDK96HlB /4cVsqG09XXMBBWMilw0aNzJhWSquidEN8+H8jTEhI2HhKs9m3omjpbgrVhZglXvWCAD ea8A== X-Gm-Message-State: AOJu0Yy/fXWWyATXNnu5uvPfCl0HTDO88koUTiYLyUSVZMJpsa27Wf4n 0YG7ls8maBLnM0+phGgjBmrNVm9I36wxZA== X-Google-Smtp-Source: AGHT+IF9kUkB/M92UXWCe1cVmXmO7MXbD+Erg0RnvxGp5LWSLUR4/oPnLi+GPiyXynQ2I55poQVg0A== X-Received: by 2002:a05:6a21:9986:b0:140:61f8:53f6 with SMTP id ve6-20020a056a21998600b0014061f853f6mr13952703pzb.29.1693839552244; Mon, 04 Sep 2023 07:59:12 -0700 (PDT) Received: from localhost.localdomain ([2001:448a:20a0:780b:2351:822a:d07f:6855]) by smtp.gmail.com with ESMTPSA id j13-20020aa7928d000000b00689f8dc26c2sm7426256pfa.133.2023.09.04.07.59.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Sep 2023 07:59:11 -0700 (PDT) To: libc-alpha@sourceware.org Cc: James Tirta Halim Subject: [PATCH] Avoid double bounds check at the start of the loop Date: Mon, 4 Sep 2023 21:56:51 +0700 Message-ID: <20230904145651.1449926-1-tirtajames45@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: James Tirta Halim via Libc-alpha From: James Tirta Halim Reply-To: James Tirta Halim Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" --- string/memmem.c | 4 ++-- string/strstr.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/string/memmem.c b/string/memmem.c index 13df3bcdd4..dea3e5a29c 100644 --- a/string/memmem.c +++ b/string/memmem.c @@ -92,7 +92,7 @@ __memmem (const void *haystack, size_t hs_len, shift1 = m1 - shift[hash2 (ne + m1)]; shift[hash2 (ne + m1)] = m1; - for ( ; hs <= end; ) + do { /* Skip past character pairs not in the needle. */ do @@ -121,7 +121,7 @@ __memmem (const void *haystack, size_t hs_len, /* Skip based on matching the hash of the needle end. */ hs += shift1; - } + } while (hs <= end); return NULL; } libc_hidden_def (__memmem) diff --git a/string/strstr.c b/string/strstr.c index 23618e2eb2..7ec812b931 100644 --- a/string/strstr.c +++ b/string/strstr.c @@ -121,6 +121,7 @@ STRSTR (const char *haystack, const char *needle) shift1 = m1 - shift[hash2 (ne + m1)]; shift[hash2 (ne + m1)] = m1; + goto start; while (1) { if (__glibc_unlikely (hs > end)) @@ -130,6 +131,7 @@ STRSTR (const char *haystack, const char *needle) return NULL; } +start: /* Skip past character pairs not in the needle. */ do {