From 8e3ca08f13f198caa7cd7dc2bb37863238bea4f2 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@gmail.com>
Date: Mon, 31 Aug 2015 14:52:59 +0200
Subject: 36347: Fix appending empty array to associations

---
 Src/params.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'Src')

diff --git a/Src/params.c b/Src/params.c
index 00f43e47d..de151a4cd 100644
--- a/Src/params.c
+++ b/Src/params.c
@@ -3312,9 +3312,12 @@ arrhashsetfn(Param pm, char **val, int augment)
 	zerr("bad set of key/value pairs for associative array");
 	return;
     }
-    if (alen)
-    	if (!(augment && (ht = paramtab = pm->gsu.h->getfn(pm))))
-	    ht = paramtab = newparamtable(17, pm->node.nam);
+    if (augment) {
+	ht = paramtab = pm->gsu.h->getfn(pm);
+    }
+    if (alen && (!augment || !paramtab)) {
+	ht = paramtab = newparamtable(17, pm->node.nam);
+    }
     while (*aptr) {
 	/* The parameter name is ztrdup'd... */
 	v->pm = createparam(*aptr, PM_SCALAR|PM_UNSET);
-- 
cgit 1.4.1