1
0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-09-25 13:30:42 +02:00

Ismail Dönmez: 29920: NO_EXEC problem with arithmetic substitution

This commit is contained in:
Peter Stephenson 2011-11-28 09:48:22 +00:00
parent ef6bed0742
commit 79dd647496
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2011-11-28 Peter Stephenson <pws@csr.com>
* Ismail Dönmez: 29920: Src/Subst.c: error with arithmetic
substitution with NO_EXEC.
2011-11-25 Peter Stephenson <p.w.stephenson@ntlworld.com> 2011-11-25 Peter Stephenson <p.w.stephenson@ntlworld.com>
* unposted: Config/version.mk: 4.3.12-test-3. * unposted: Config/version.mk: 4.3.12-test-3.
@ -15618,5 +15623,5 @@
***************************************************** *****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL * This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5507 $ * $Revision: 1.5508 $
***************************************************** *****************************************************

View File

@ -247,7 +247,10 @@ stringsubst(LinkList list, LinkNode node, int ssub, int asssub)
if (endchar == Outpar && str2[1] == '(' && str[-2] == ')') { if (endchar == Outpar && str2[1] == '(' && str[-2] == ')') {
/* Math substitution of the form $((...)) */ /* Math substitution of the form $((...)) */
str[-2] = '\0'; str[-2] = '\0';
str = arithsubst(str2 + 2, &str3, str); if (isset(EXECOPT))
str = arithsubst(str2 + 2, &str3, str);
else
strncpy(str3, str2, 1);
setdata(node, (void *) str3); setdata(node, (void *) str3);
continue; continue;
} }