From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16158 invoked by alias); 21 Jan 2018 01:48:07 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 42308 Received: (qmail 1408 invoked by uid 1010); 21 Jan 2018 01:48:06 -0000 X-Qmail-Scanner-Diagnostics: from mail-pf0-f194.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(209.85.192.194):SA:0(1.6/5.0):. Processed in 3.454291 secs); 21 Jan 2018 01:48:06 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: * X-Spam-Status: No, score=1.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, FSL_HELO_FAKE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_PASS,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.1 X-Envelope-From: joeypabalinas@gmail.com X-Qmail-Scanner-Mime-Attachments: |signature.asc| X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=UPzFb4qtwERZ0GuySMffYv7coipQOAVZF7kNXysvXJw=; b=JaP8y4FBh/e5ihd3/tMgAoZbj/Upwc8jjhCAhPolTX1Kl9Nzj6eHxZFzEQk6OYQk77 sNRSB36GQnEihG4RKLLrIRM7E8yur/vR+vPQZMYYSCn0TaNwrG1toVOZSiIXhUzkM4ay URpy/FLYl7jTpwIdX0Dm+rYfs4bChdYW7m+5sE67rQ2PI/2k5FtHWhsWt7fcM8lDKyQc nUSNq1YbSAGtaJn6pkss5Hzb+Qjri1m+FZFE1qyVnt6Tul/u7WDior9/mXv0SzIc0QoP JiF8/aSUUku0UBjQTAol/ntiCpDTpJNo3FX6spTR7zW+59gS7WpBjSXWms6+1doyNqgC f8Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=UPzFb4qtwERZ0GuySMffYv7coipQOAVZF7kNXysvXJw=; b=P7JrZMRVtUPOG87sNaJpKrvb31vA8pLGJ3/6sPS1JtjJ6VzkWH75fNRduLyyk6uqZO hTo+MBReRiZiM0LSVEtsSWZfLc1+nshozx01zEuuRfJwbH0cdRDjAoL4QGQDf8sN9Yro 4ha0N+PXK+aYKrpWDTWWYB7jVS9qzqQHhgwOug/zixNhhPNjRts5LNnu8J64Uv1JHohv hOrsI/Qvg+5dLzISFttEnlS9izvMCifgx9DJIePAZ03QqYrPB4N8N8NsiarJesuRWLML lLLOslU3i5lv9d4m6NsAcOpmnq/BjWemJXVeWXV6PlgRGWTaOujTU8ECFAPNP0IRb6N2 78Vg== X-Gm-Message-State: AKwxyteLG9zu4+s4FYCUvbBesV4UTZaP1FZVte8IjPdXbip8vrtstxge 9MArZf3zGsl+Sy0JTXDaLkI= X-Google-Smtp-Source: AH8x227KJkJs72gFlNNrcRo6y3hmQixURksl+qh2sIG1cM88smusklQyRQ43lGx3lgphe6Nmy+83PA== X-Received: by 10.101.72.11 with SMTP id h11mr3361369pgs.386.1516499280914; Sat, 20 Jan 2018 17:48:00 -0800 (PST) Date: Sat, 20 Jan 2018 15:47:58 -1000 From: Joey Pabalinas To: Bart Schaefer Cc: zsh-workers@zsh.org, Daniel Tameling Subject: Re: [PATCH] jp: fix segfaults during parameter expansion Message-ID: <20180121014758.lu7vt7qg4kuup5qd@gmail.com> References: <20180114060557.hmrvpg6t4rdebgv6@gmail.com> <180120160304.ZM12968@torch.brasslantern.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="4iotujkgm4s7vl7i" Content-Disposition: inline In-Reply-To: <180120160304.ZM12968@torch.brasslantern.com> User-Agent: NeoMutt/20171215 --4iotujkgm4s7vl7i Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Running: > $ zsh -fc ': ${${(PAA)p[foo]}::=3Dx}'` in current zsh versions causes: > > [1] 4441 segmentation fault (core dumped) zsh -fc ': ${${(PAA)p[foo]}::= =3Dx}' Also happens when testing with machabot: > 19:42 > : ${${(PAA)p[foo]}::=3Dx} > 19:42 jp: zsh[248]: segfault at 0 ip b7dfcda3 sp bfeb9ebc > error 4 in libc-2.13.so[b7d84000+149000] Add a simple `dupstring(s)` fallback. Signed-off-by: Joey Pabalinas Requested-by: Bart Schaefer 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/subst.c b/Src/subst.c index d027e3d83cadc631a7..d159a92ae1bc1b9c10 100644 --- a/Src/subst.c +++ b/Src/subst.c @@ -2423,14 +2423,14 @@ paramsubst(LinkList l, LinkNode n, char **str, int = qt, int pf_flags, * substitution. */ if (isarr) { - if (aval[0] && aval[1]) { + if (!aval[0] || (aval[0] && aval[1])) { zerr("parameter name reference used with array"); return NULL; } val =3D aval[0]; isarr =3D 0; } - s =3D dyncat(val, s); + s =3D val ? dyncat(val, s) : dupstring(s); /* Now behave po-faced as if it was always like that... */ subexp =3D 0; /* --=20 2.16.0 Incorpated your changes, although I feel like the conditional operator is a better fit here (simpler and much more concise; making each possibility a lone function call is one of the few uses of `?:` where the intent is flat-out obvious). Tested and works great: > $ : ${${(PAA)p[foo]}::=3Dx} > > zsh: parameter name reference used with array --=20 Joey Pabalinas --4iotujkgm4s7vl7i Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEKlZXrihdNOcUPZTNruvLfWhyVBkFAlpj8U4ACgkQruvLfWhy VBmXyA/8DEXAvFNGroh3jT/U4Z192fl8cVoErxHCux9ZEKLjf4qVg/fV0Z2DelNb DO6Pc8H21U2nTtNKN4WFkSypcnE9PUurUfFLt2aHqNmQreJ0XuhtDRIOHlGjstye EjHM9Vea+7unHraSHboLwL+jz49T9eqzfjxDdCABJATcAl6cZ9CMHbRFZhBnuqAm vsTDNV74L5uejMB3NDJOy14pHLd1oFOudM9Nf6iioIzeV19jI98g+ADM8LlgC2WO e34b69f63AvC0ZyPB3ZMJMLQZehHqAXHlUT6xy0NHaPZuFrtDRZDwPWdotFSbsz6 dOpzj2So/Hh5UX3ud6YJNJvu2aucv511BDFzaNthbOqDBRNAyhYz2kTy7XHISVoo gK7M5ZD9QG4iqX4JTSOjGj/tnl1XSynasxvuTUuK0KHnz1YCK/laG5109XT64Ev7 uN5nanhGy3nqiICH20Et5DjU5ADuuS7DmpLhQilPyRDhR1jJmgannTp31IquZbNZ iKKiOOo7gTVQe/uDkIHMZMcO8sCCmR6hOiCJZB+PKKBGzky5PFmBiXCidjD47vGO ErV5hoOmzuSzqlWAfXvdUUI7ijRuy/Y/MYOF4EcV5DBmXRdXx6GlukSKF69W16kZ ZjG4ay9s5uxfjdgYMAZRK2uLBtz6Wfu/0QjNMWUmm7qyX8KJ88c= =+3YX -----END PGP SIGNATURE----- --4iotujkgm4s7vl7i--