From fa5f59bf710099dcaa8f22729591c2580c052db9 Mon Sep 17 00:00:00 2001 From: Bart Schaefer Date: Fri, 4 Dec 2020 15:09:14 -0800 Subject: Additional tied-array cleanup when tied scalar had a previous value --- Src/builtin.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Src/builtin.c b/Src/builtin.c index 68ebead7e..fff0b641f 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -2933,11 +2933,11 @@ bin_typeset(char *name, char **argv, LinkList assigns, Options ops, int func) if (asg->value.array) { int flags = (asg->flags & ASG_KEY_VALUE) ? ASSPM_KEY_VALUE : 0; assignaparam(asg->name, zlinklist2array(asg->value.array, 1), flags); - } else if (oldval) - assignsparam(asg0.name, oldval, 0); - else /*if (asg0.value.scalar)*/ { + } else /*if (asg0.value.scalar || oldval)*/ { /* We have to undo what we did wrong with asg2 */ apm->node.flags &= ~PM_DECLAREDNULL; + if (oldval) + assignsparam(asg0.name, oldval, 0); } unqueue_signals(); -- cgit 1.4.1