From e6946adf57a44fe84781f20c395ba51bd39fd4d9 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Sat, 20 Nov 2010 23:46:26 +0000
Subject: 28425: remove null arguments and untokenize

---
 ChangeLog   | 6 +++++-
 Src/subst.c | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 947b84777..c8ecb4bd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-20  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* 28425: Src/subst.c: remove null arguments and untokenize.
+
 2010-11-18  Peter Stephenson  <pws@csr.com>
 
 	* 28419: Doc/Zsh/expn.yo, Src/subst.c, Test/D04parameter.ztst:
@@ -13828,5 +13832,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5123 $
+* $Revision: 1.5124 $
 *****************************************************
diff --git a/Src/subst.c b/Src/subst.c
index 23c3a7bb5..12825ff93 100644
--- a/Src/subst.c
+++ b/Src/subst.c
@@ -1403,6 +1403,8 @@ check_colon_subscript(char *str, char **endp)
     if (parsestr(str = dupstring(str)))
 	return NULL;
     singsub(&str);
+    remnulargs(str);
+    untokenize(str);
 
     **endp = sav;
     return str;
-- 
cgit 1.4.1