package/busybox: add 2 upstream fixes (ash & cpio), bumb release number
[openwrt/svn-archive/archive.git] / package / busybox / patches / 000-upstream-ash.patch
1 --- a/shell/ash.c
2 +++ b/shell/ash.c
3 @@ -5424,7 +5424,11 @@ rmescapes(char *str, int flag)
4 size_t fulllen = len + strlen(p) + 1;
5
6 if (flag & RMESCAPE_GROW) {
7 + int strloc = str - (char *)stackblock();
8 r = makestrspace(fulllen, expdest);
9 + /* p and str may be invalidated by makestrspace */
10 + str = (char *)stackblock() + strloc;
11 + p = str + len;
12 } else if (flag & RMESCAPE_HEAP) {
13 r = ckmalloc(fulllen);
14 } else {