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.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 27843 invoked from network); 1 Apr 2022 04:16:00 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 1 Apr 2022 04:16:00 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1648786560; b=Ol5xG/gWr7HkDzabZHeO922UB+J1k0nXlUJZmoilMqWUyvcLRK1Y318djwEwe1lC/UBpycJPZA 51c9GJWgLc3PL3QVlinllvcAeF2kF2ccdJcS3yL+WIUMb80n6MyhJxjFF/G4qEk2Syhn+WVOUH uAwq1Z4x2ulLKTNJ+sWmVhhiPjZow+fsU9RbCGAtNLYMvlczmFhNhLIUzmKQXScV/hrO6BhnhG PjwTVK1PcJNR/8/zNZkCeeTU90gYy5Uh7FbwrvUrpkRRqykGrSY/n+AajUSUVZjK4zmGgciXC1 nVk3MgntkB85ySoA2O74lx7s9yR/VsJ7Sib8h6TLu+JoRA==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-lf1-f50.google.com) smtp.remote-ip=209.85.167.50; dkim=pass header.d=brasslantern-com.20210112.gappssmtp.com header.s=20210112 header.a=rsa-sha256; dmarc=none header.from=brasslantern.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1648786560; bh=TP81Qo8ltcJjhilmonRokSjtP+uLOmq0OKd6a/q/+cs=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Type:Cc:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:DKIM-Signature:DKIM-Signature; b=rQAaGHfN4OcZnmmyt3QlJ3e4bKLOVCr/RLrb0nrKnm4TPLHo4c+96ukGAYgxT6/lTlcaFeh2gS n5VYr/zK+ke/GNj1eVpNS6jmlBopsIkBqN+01eTiLMYazZwAiW3m28UnQ5E/QuLjelj7xYpk22 XXPU5kAa7S4vElaicN+luTdW2qttMeyQmF0xbHHyAoVfUv36SOAhu6/tDMpsx7cOt8llQGrKeG PgnZ82fB95zr2JlrGEIAfz3aaoKfep9xLGNGHIokhMLjaBTTN86/k3F+iLoQnMSAUwUigpznla OV9cxlnmc3I6ZTHfxYa/FPpcWOcTi4hnRxTnu1bvo6P5Mg==; 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-Type:Cc:To:Subject:Message-ID :Date:From:In-Reply-To:References:MIME-Version:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=MzfhU/bx+3yY3597fxNnmS680qgOTRC2qgGsJeyLgu4=; b=bzM8MOtk0vmECPHUiMFuZV8/RN iX9tVKDg4Nuegf7EGEP+MxDpxn8JLh1xqR5GhieNQSazUY7dhPoBdHW5TFmiRevbQpaoj9EMohXuc Af2ryCTmHO1iVtpmMf9CkFFEvA/iSmF5OOfn8V6rUvctkZSjvT8DKjGtwScTlt+VaL4xip+vHOyeg l+BLZZl3qFQO5xkPCLm6GTDMPmBTbrSW1YTSImGvgiV9RXC74JQUBugkL7PG3sK+YqgaP38tWq1jA bHPz9lC104akiW9Wj3KRJDLn7fuJy6FUlS0d+fEgXYjIQ26RwJebvV5j3mVQdRDNgT+F3UJbJYvTr OkV6icyQ==; Received: from authenticated user by zero.zsh.org with local id 1na8hb-000Plw-BZ; Fri, 01 Apr 2022 04:15:59 +0000 Authentication-Results: zsh.org; iprev=pass (mail-lf1-f50.google.com) smtp.remote-ip=209.85.167.50; dkim=pass header.d=brasslantern-com.20210112.gappssmtp.com header.s=20210112 header.a=rsa-sha256; dmarc=none header.from=brasslantern.com; arc=none Received: from mail-lf1-f50.google.com ([209.85.167.50]:44920) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1na8hD-000PSO-Q8; Fri, 01 Apr 2022 04:15:42 +0000 Received: by mail-lf1-f50.google.com with SMTP id m3so2627272lfj.11 for ; Thu, 31 Mar 2022 21:15:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brasslantern-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=MzfhU/bx+3yY3597fxNnmS680qgOTRC2qgGsJeyLgu4=; b=eo6GBfkNt6s4aqIqmTv3A1gLC6NS/bydcuQqQJetQBTjX/o0fb2h2AJdZdpfqe7Hmo wOsca+JYVXd9zpl/7jka8C/YZlNeMlpKAr1zQgCr609bMSheMfR5jAexso3oRUJA+eSd KiCqxePA94C4XgmJwnIZnIRCIXSr4jXujlpaqiPXlPi2MQlBJaEH22rcjxEUUbsBQbW0 COiZHLU6dsUeZISH1F4WKo2CvFPXWvdMUv0PLerCkQ2lJVz+jiRIfkAbtd3SkSOSwU2Z Jm0GZV3/SmQf07i6e3eJ5k7/FB1dtXKXwnU4sPXNvgc3E2F/shTmuQ5v0Yl2fth3q5ED WS4Q== 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=MzfhU/bx+3yY3597fxNnmS680qgOTRC2qgGsJeyLgu4=; b=yPIPa+LJUsCXs3WifPnPnxR5GFPifas5c+tNNm3bBmmYCvmeJ6u0G5ooP43Fk2rK3Y 2W7xiUM9e0nijxo87kJLK8jwEJ65TfC/jedAyDpt2UYJunJuTax7SIhFOjz9fIVG9Bnf prz2dOP8xkSOsIPx8RdGMJeynOuKEr3snb9BpU5SmZey7hhAQUf4prLS3StfX9QzL/WC MIxUajUYsVHpa9o5dqBBtj1CZaBU4K0MRBcNlaB/oMxN/9S35H6G/4cSsdur60e6mVN8 Osgtujkb5xDjDqFFToEIfsC8nUtu71WJopgUrBYwydo3e360JRek2FAnf/UrgQMW9S66 bImg== X-Gm-Message-State: AOAM533EFTyqNB+K7MiDpML0Iq4SNN/5cmNOqEKwxy93USaxFsw7+kO4 k80uITt8RlPPU7U07u8ALghUVKQOKTQOF+TrG6FdIkbvxaZEhg== X-Google-Smtp-Source: ABdhPJz8YJfizwyxsYQjXs2ACeTBfA1GSlFWIwy8EPVxvm65tuH8Bh8reYYJc8ZLNuzcESkdfdu21Au3mC3jTVIpAo4= X-Received: by 2002:a05:6512:1513:b0:448:39c0:def0 with SMTP id bq19-20020a056512151300b0044839c0def0mr12529439lfb.469.1648784962194; Thu, 31 Mar 2022 20:49:22 -0700 (PDT) MIME-Version: 1.0 References: <1514882387.357077.1640002234148@mail2.virginmedia.com> <20220228.222457.2128269761925169168.enometh@meer.net> <20220401.075520.1210015109905370739.enometh@meer.net> In-Reply-To: <20220401.075520.1210015109905370739.enometh@meer.net> From: Bart Schaefer Date: Thu, 31 Mar 2022 20:49:10 -0700 Message-ID: Subject: Re: PATCH: pattern incremental search To: Madhu Cc: =?UTF-8?Q?Lawrence_Vel=C3=A1zquez?= , Zsh hackers list Content-Type: text/plain; charset="UTF-8" X-Seq: 49953 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 Thu, Mar 31, 2022 at 7:26 PM Madhu wrote: > > No. I scanned the git commit, it probably fixes the bug introduced in > "49658: Fix NULL reference in match code." but since it doesn't touch > the code path for the case where zsh is built without multibyte, it > don't believe it addresses the problem I raised at all. The following appears to fix the crash problem. I don't know what else the rest of the patch in workers/49781 accomplishes. diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c index d9d9503e2..c8c6f78c6 100644 --- a/Src/Zle/zle_refresh.c +++ b/Src/Zle/zle_refresh.c @@ -255,7 +255,9 @@ int cost; #endif static const REFRESH_ELEMENT zr_cr = { ZWC('\r'), 0 }; +#ifdef MULTIBYTE_support static const REFRESH_ELEMENT zr_dt = { ZWC('.'), 0 }; +#endif static const REFRESH_ELEMENT zr_nl = { ZWC('\n'), 0 }; static const REFRESH_ELEMENT zr_sp = { ZWC(' '), 0 }; static const REFRESH_ELEMENT zr_zr = { ZWC('\0'), 0 }; diff --git a/Src/glob.c b/Src/glob.c index 349862531..63939fea8 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -3355,7 +3355,7 @@ igetmatch(char **sp, Patprog p, int fl, int n, char *replstr, /* longest or smallest at start with substrings */ t = s; if (fl & SUB_GLOBAL) { - imd.repllist = newlinklist(); + imd.repllist = (fl & SUB_LIST) ? znewlinklist() : newlinklist(); if (repllistp) *repllistp = imd.repllist; }