Re: How to substitute empty array element, or empty string

Re: How to substitute empty array element, or empty string

[Peter Stephenson]

On Wed, 22 Mar 2017 09:52:12 +0000
Peter Stephenson <p.stephenson@samsung.com> wrote:
> Other cases in igetmatch() may need adaption.

This appears to be one.

pws

diff --git a/Src/glob.c b/Src/glob.c
index 9ac0ae6..af5d082 100644
--- a/Src/glob.c
+++ b/Src/glob.c
@@ -2929,7 +2929,7 @@ igetmatch(char **sp, Patprog p, int fl, int n, char *replstr,
 	     * move forward along string until we get a match. *
 	     * Again there's no optimisation.                  */
 	    mb_charinit();
-	    for (ioff = 0, t = s, umlen = umltot; t < send ; ioff++) {
+	    for (ioff = 0, t = s, umlen = umltot; t <= send ; ioff++) {
 		set_pat_start(p, t-s);
 		if (pattrylen(p, t, umlen, 0, &patstralloc, ioff)) {
 		    *sp = get_match_ret(&imd, t-s, umltot);
@@ -2937,6 +2937,8 @@ igetmatch(char **sp, Patprog p, int fl, int n, char *replstr,
 		}
 		if (fl & SUB_START)
 		    break;
+		if (t == send)
+		    break;
 		umlen -= iincchar(&t, send - t);
 	    }
 	    if (!(fl & SUB_START) && pattrylen(p, send, 0, 0,
diff --git a/Test/D04parameter.ztst b/Test/D04parameter.ztst
index 99f7dd9..66d9022 100644
--- a/Test/D04parameter.ztst
+++ b/Test/D04parameter.ztst
@@ -2158,3 +2158,13 @@ F:behavior, see http://austingroupbugs.net/view.php?id=888
 >x
 >x
 >y
+
+  a=(1 "" 3)
+  print -rl -- "${(@)a//#%*/x}"
+  a=""
+  print -rl -- "${(@)a//#%*/y}"
+0:Zero-length string match at end
+>x
+>x
+>x
+>y