From 7a951ef93ef2cc6baac9ec3b51909ad44e4bfe15 Mon Sep 17 00:00:00 2001
From: Peter Stephenson
Date: Wed, 11 Nov 2015 22:14:16 +0000
Subject: 37094: Further tweaks to parameter name references.
Safety in array test.
Make nested references work.
Add parameter tests.
---
Src/subst.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'Src/subst.c')
diff --git a/Src/subst.c b/Src/subst.c
index f3a4ad44d..c1369b5a7 100644
--- a/Src/subst.c
+++ b/Src/subst.c
@@ -2315,7 +2315,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags,
* substitution.
*/
if (isarr) {
- if (aval[1]) {
+ if (aval[0] && aval[1]) {
zerr("parameter name reference used with array");
return NULL;
}
@@ -2324,7 +2324,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags,
}
s = dyncat(val, s);
/* Now behave po-faced as if it was always like that... */
- subexp = aspar = 0;
+ subexp = 0;
}
v = (Value) NULL;
} else if (aspar) {
@@ -2360,7 +2360,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags,
* far has just yielded us a parameter name to be processed
* with (P).
*/
- else if (!subexp || aspar) {
+ if (!subexp || aspar) {
char *ov = val;
/*
--
cgit 1.4.1