From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 23984 invoked from network); 20 Dec 2021 12:10:52 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 20 Dec 2021 12:10:52 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1640002252; b=PsJpYEYnR3da8pDRsTULeH2R6lQ8pPKn0UBPG4iudQgZ3LZS9JQjQrCwdvQBgLuvo558ifENFh 1EexWomKAUr0IFoVVHFHQaoKBFOEWl2pRLGcTCA+PBBp1JQJw95e8A3x8gndDrzbBXl38oZCQe wcFZCH9AeEXSTT467JtWKHEn8Kna3g+rTlQghiFJkQMemB4zwzos32ov91EHbdLcRS8YkLWoMS EhTcbCUBeVpdU9flydmIlAmYg2ABrnZUYeePih9vKB9ByQJPo0n+osCOP7rIQK/T3zcxsozNOx kw9cPW3b5BBItRt6AjjW1RiJ1RuFBbuim5D8cdAmVl3AbA==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (smtpq1.tb.ukmail.iss.as9143.net) smtp.remote-ip=212.54.57.96; dkim=pass header.d=ntlworld.com header.s=meg.feb2017 header.a=rsa-sha256; dmarc=pass header.from=ntlworld.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1640002252; bh=QyujHYd7ZPPblmgrLdcTgQnaNfEPT9TggaI+C3qtzT8=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject: References:In-Reply-To:Message-ID:To:From:Date:DKIM-Signature: DKIM-Signature; b=ce899Ouk3hX9WrMRJxCSYIZjhEj+VxzdRw6hjc6141eWufrCphAQ6mht3ccDuERqgc19ZQRE/P FiqFCE6aLceciRjsMP/xo+WYDtQ8w8EZmZRkhCiBIfNRFe1xCb6Uvpt7LVqRbUMnjnpqGgFMFQ RTTRXKPD3PaVf1lQV8o3Sw/d3WMbWwovd3uJlD+tsLnLfiWSDRSu2UAiYjEAVsevgjOMbTgTgD QsOHX0AVPoTeTiGbwLyDa9JQU8aW+jnUI84GR3K3cfcTFB6BAGr4hac5msj4b5BaMgRpvlzjwD R2Z2iwWNgjXxippqIftYJY6KcDQGSJcjSGglN+4mSY4eGA==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:References:In-Reply-To:Message-ID:To:From: Date:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=u6qxcYZLYKlqmw9L0RHpjOx9sxlfFTBJpCOf8LsTQks=; b=ciO3EXWusMyAjlgxLBt24Iq8Qq pD1/m8plqb7BUHALbequzEqzsqKI/ktJBJgj9swyZ2EkySZBLWZRlxJgq1RSMbcIEaM5HHkTFUR9J jt2M878pi8/MOfUv/V789eXbWKVgPUMVpJ7XZsvzgMCstsPjmGEFUJnXBgWq8cwpJ0JAdNbn34IEt buqbEt3XX6uj94vzDYz4gw7hRi7BvVpMxOsQONAIJYhTiemXcEkla3lm0B3jp3UgoEhIjIg95c41L R7hvWJPQ4RSNANKjPtw2WSytCgOSWy0VyytApNYXBg69GQEOd2MXA6J5Fgzh6wdlg0PPXAQ2oEoP7 3vG4+Fkg==; Received: from authenticated user by zero.zsh.org with local id 1mzHVC-000Gxs-NW; Mon, 20 Dec 2021 12:10:50 +0000 Authentication-Results: zsh.org; iprev=pass (smtpq1.tb.ukmail.iss.as9143.net) smtp.remote-ip=212.54.57.96; dkim=pass header.d=ntlworld.com header.s=meg.feb2017 header.a=rsa-sha256; dmarc=pass header.from=ntlworld.com; arc=none Received: from smtpq1.tb.ukmail.iss.as9143.net ([212.54.57.96]:45726) by zero.zsh.org with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) id 1mzHUw-000GeA-Lh; Mon, 20 Dec 2021 12:10:35 +0000 Received: from [212.54.57.81] (helo=smtp2.tb.ukmail.iss.as9143.net) by smtpq1.tb.ukmail.iss.as9143.net with esmtp (Exim 4.90_1) (envelope-from ) id 1mzHUw-0005Fm-8f for zsh-workers@zsh.org; Mon, 20 Dec 2021 13:10:34 +0100 Received: from oxbe3.tb.ukmail.iss.as9143.net ([172.25.160.134]) by smtp2.tb.ukmail.iss.as9143.net with ESMTP id zHUwmYbkuT3lizHUwmevjM; Mon, 20 Dec 2021 13:10:34 +0100 X-Env-Mailfrom: p.w.stephenson@ntlworld.com X-Env-Rcptto: zsh-workers@zsh.org X-SourceIP: 172.25.160.134 X-CNFS-Analysis: v=2.4 cv=dvfItns4 c=1 sm=1 tr=0 ts=61c072ba cx=a_exe a=rX2mKgs1IZJU9lF6pltyEQ==:117 a=I_Av47A-8eYA:10 a=IkcTkHD0fZMA:10 a=vinPr5In5y8A:10 a=pGLkceISAAAA:8 a=NLZqzBF-AAAA:8 a=-_-1wk5qYGV5VwuVpNQA:9 a=QEXdDO2ut3YA:10 a=wW_WBVUImv98JQXhvVPZ:22 X-Authenticated-Sender: p.w.stephenson@ntlworld.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ntlworld.com; s=meg.feb2017; t=1640002234; bh=QyujHYd7ZPPblmgrLdcTgQnaNfEPT9TggaI+C3qtzT8=; h=Date:From:To:In-Reply-To:References:Subject; b=LY4WMi6SgQXPEf4sD1pwy6LO8Wmvqbv6pbUvQ2J7zwizzo90He3s1iiGOFJ+HaIwL xdZnIY5ylpkUaVGORT1MHMdDhaycL/OwXeT5a2JrZ0L1ykWbpcs6Izu1GllmtlcneM 6etuG56Bz3iKJQWHcs1uI5xxvYyaBcq7EfF4S09Gezu1JgBKKibRgJWDQoRLpTkES/ aa/LKMKPAseUUEQZFdnZK65nuGMu2SuKgejdIyRqnzQrN5cvqY7Uzpnf4ryrbqH3Go p/yFKBY/+VK4pBUeyZp1SjMuCnNx/bOEx76Wp9VT+znNGORIlV9rv/M/wpzI/7MHKq LfWByOffVFiBg== Date: Mon, 20 Dec 2021 12:10:34 +0000 (GMT) From: Peter Stephenson To: Zsh hackers list Message-ID: <1514882387.357077.1640002234148@mail2.virginmedia.com> In-Reply-To: References: <26439.1209238907@pws-pc> Subject: Re: PATCH: pattern incremental search MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Medium X-Mailer: Open-Xchange Mailer v7.8.4-Rev72 X-Originating-IP: 165.225.17.146 X-Originating-Client: open-xchange-appsuite X-CMAE-Envelope: MS4xfFgdNnhdkgze7APA4SBUTrrlbMTCc9qDZlY8yt+DGhdbAPxfE5YCGyaGMPbrB9oxvL6r1vzYictEf3gXHh6UAehW9DSphfYcN2eBripOtOrIky9JlsbC oxYiWmfvH5fqYD4mWOV3avf5JBd6+Wt9a1f75kH9OOWROLlD3BDFUd9qpQGFpMAKFo0w8L5qXvJEXCx3HKdpeC00CWczolCjwUyhvzoR2PfjrtFMLOcnztrd X-Seq: 49658 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: On 12/20/21, Mikael Magnusson wrote: > On 4/26/08, Peter Stephenson wrote: >> - if (replstr) { >> + if (replstr || (fl & SUB_LIST)) { > Someone in the irc channel reported a crash on this strlen when doing > history-incremental-pattern-search-backward with any search, and they > can reproduce it with the latest git version too, they posted this > backtrace: That extra test doesn't look like it makes any sense --- I think it may just be in completely the wrong place and shouldn't be in get_match_ret() at all since it's similar to some checks in other places where we allow zero-length (but not NULL) strings for some edge cases in some variants of matching. We should probably just remove it and see what happens. pws diff --git a/Src/glob.c b/Src/glob.c index bee890caf..375671cea 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -2549,7 +2549,7 @@ get_match_ret(Imatchdata imd, int b, int e) e += add; /* Everything now refers to metafied lengths. */ - if (replstr || (fl & SUB_LIST)) { + if (replstr) { if (fl & SUB_DOSUBST) { replstr = dupstring(replstr); singsub(&replstr);