summaryrefslogtreecommitdiffstats
path: root/package/busybox/patches/000-upstream-ash.patch
blob: c90e9d25c82caca609f5988efd6aafd89eb5bd18 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -5424,7 +5424,11 @@ rmescapes(char *str, int flag)
 		size_t fulllen = len + strlen(p) + 1;
 
 		if (flag & RMESCAPE_GROW) {
+			int strloc = str - (char *)stackblock();
 			r = makestrspace(fulllen, expdest);
+			/* p and str may be invalidated by makestrspace */
+			str = (char *)stackblock() + strloc;
+			p = str + len;
 		} else if (flag & RMESCAPE_HEAP) {
 			r = ckmalloc(fulllen);
 		} else {