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 autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 23636 invoked from network); 8 Sep 2023 16:36:14 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 8 Sep 2023 16:36:14 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1694190974; b=GPclJ3ARWfLYYXDkmzKkdBti2k6OFedg0/4uXzSlEL6nr3HD2qc8An4GjiyYWDpdGdpiISgz+8 D+0ihgl269dsyEhbfY/ge8e1P8jRilmIk5d2RZIukaun9Xo1Vgrp0Q8YgQS1dOXj0aFueZHJIr RtNVxHQmqGhVumHVzICeZG1RVjs2ixvU80L97cI1IkZPChh4AZKmruXAowLLcIuN6ofPlSMLXS JHHclImWhzg8qo6xbWJmiG7AFO07dCzsT5oGznYUHE5HOA4t7ijhmfCW7e5EqctDo+Ie8At83U dc9OMYtLRDj0edj90l2Ng51kGeTCqxnmZ9eFHGUT6+0MfA==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (snd01006-bg.im.kddi.ne.jp) smtp.remote-ip=27.86.113.22; dmarc=none header.from=kba.biglobe.ne.jp; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1694190974; bh=g4EfAnI5aGhjG4c2MFTvMXVx3g1+YmB/VectzFxg9R8=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:To:References:Message-ID:Content-Transfer-Encoding:Date: In-Reply-To:From:Subject:MIME-Version:Content-Type:DKIM-Signature; b=IAimi5bNZ/902I4+HqJ1NSx40tuU4e23laDP2pHgQgNHWd50j2OSnTFM2V/4M209V1qzjTqo5k een/+hZhaeRDMKEYM1WJfY4PjTMaxhYM3HvD3aalH4RDCRji2GrQECB/HXrIbPv1H6PfdsvnSX UJRH6fvIR2iGFWBFHLzVGavg1cOldOOz+JxjnY8RVK+5Por/D3hPpYh3A3KRAdMQKmobrMkvNQ pUPa1JFcWkU13fn77dDcE6LHVPWbPzaJMLK9AA5LWg/iRhuaWgjtJJpy6qJF4zCl7/JtSYkZ7o 1wHqD5dK9WoVTqS7JxDFjMyNYAMx2HDFwyqpr9xPWyVj6w==; 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:To:References:Message-Id: Content-Transfer-Encoding:Date:In-Reply-To:From:Subject:Mime-Version: Content-Type:Reply-To:Cc:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=Skt8pORtw+F2xsxzdB044Xu73dxRxa8zxon86bwQE/U=; b=f8wSr/E4C523VCWvqSAJjdr5WJ rsgdpFUqrPgboTsTBaAY7elMk/LPncebZtmMlpN2MPrfy1vedWuOgM9UIBL5MMi0C9qmsDWZ9an16 h3TQkbkEZ+fsr1oVe20LpQj7x8umQtuUjAtyArAfC4BYN0QAVjWYKC8CQZtxcbd9Q4/fbLm3Yrstk m1pKGgnS2pp3ZUknnl6HrBMO4pJ6glwlEvfAQJ1Y8IxlriiaClhvrAthIKzfuB4Dl5/rGuQEngbOv VjucyQJ8v2Bt4ppu/jO3LGSrgFaMlyS5m2CcAID3e0UGF+lmGoAKdKDGrnPkC3gALDqx2ZBRKov1N McQIJwNg==; Received: by zero.zsh.org with local id 1qeeSq-000FRK-MQ; Fri, 08 Sep 2023 16:36:12 +0000 Authentication-Results: zsh.org; iprev=pass (snd01006-bg.im.kddi.ne.jp) smtp.remote-ip=27.86.113.22; dmarc=none header.from=kba.biglobe.ne.jp; arc=none Received: from snd01006-bg.im.kddi.ne.jp ([27.86.113.22]:51041 helo=dfmta1001.biglobe.ne.jp) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1qeeNc-000F2R-2i; Fri, 08 Sep 2023 16:30:49 +0000 Received: from mail.biglobe.ne.jp by omta1001.biglobe.ne.jp with ESMTP id <20230908163037194.XQVB.98282.mail.biglobe.ne.jp@biglobe.ne.jp> for ; Sat, 9 Sep 2023 01:30:37 +0900 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.3\)) Subject: Re: (LC_ALL=C; set -x 128 129; printf "%s\n" ${(#)@} | hexdump -C) From: "Jun. T" X-Priority: 3 In-Reply-To: <899459233.232418.1694104433053@mail.virginmedia.com> Date: Sat, 9 Sep 2023 01:30:36 +0900 Content-Transfer-Encoding: 7bit Message-Id: <64346084-434A-4A42-AD56-44809DA2E54C@kba.biglobe.ne.jp> References: <20230830072753.hhveg7teosubwzq7@chazelas.org> <88812889-04BC-412A-85BE-BDAA2326B29B@kba.biglobe.ne.jp> <899459233.232418.1694104433053@mail.virginmedia.com> To: zsh-workers@zsh.org X-Mailer: Apple Mail (2.3696.120.41.1.3) X-Biglobe-Sender: takimoto-j@kba.biglobe.ne.jp X-Seq: 52122 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: > 2023/09/08 1:33, Peter Stephenson wrote: > > Looks like these are the only calls to substevalchar(), so perhaps > the changes could be made internal to that. I changed paramsubst() just because we can assume errflag=0 at the start of the block (and would make the things simpler.). But, anyway, my previous patch was not complete. Either with or without my previous patch (in any locale): % echo ${(#X):-@} zsh: bad math expression: illegal character: @ This is OK. But: % printf "%s\n" ${(#):-@} | hexdump -C 00000000 22 0a 22 |"."| 00000003 The quote removal is done in remnulargs() ( at subst.c:169). So it seems that if noerrs is set (without (X) flag) then we should not quit from prefork() at line 146. This means, I guess, substevalchar() should not return NULL if noerrs is set. But if we want to continue even if we have a bad math expression, only thing we can do is just to return "" instead of NULL. The patch below (hopefuly) does this. Any comment is welcome. diff --git a/Src/subst.c b/Src/subst.c index 14947ae36..d68159227 100644 --- a/Src/subst.c +++ b/Src/subst.c @@ -1489,11 +1489,18 @@ subst_parse_str(char **sp, int single, int err) static char * substevalchar(char *ptr) { - zlong ires = mathevali(ptr); + zlong ires; int len = 0; + int saved_errflag = errflag; - if (errflag) - return NULL; + errflag = 0; + ires = mathevali(ptr); + + if (errflag) { /* not a valid numerical expression */ + errflag |= saved_errflag; + return noerrs ? dupstring(""): NULL; + } + errflag |= saved_errflag; #ifdef MULTIBYTE_SUPPORT if (isset(MULTIBYTE) && ires > 127) { /* '\\' + 'U' + 8 bytes of character + '\0' */