From 14fe6e0238d151e394c1af1248e1a934ed39f816 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Tue, 27 Apr 2010 11:59:19 +0000 Subject: package/busybox: add 2 upstream fixes (ash & cpio), bumb release number SVN-Revision: 21186 --- package/busybox/patches/000-upstream-ash.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 package/busybox/patches/000-upstream-ash.patch (limited to 'package/busybox/patches/000-upstream-ash.patch') diff --git a/package/busybox/patches/000-upstream-ash.patch b/package/busybox/patches/000-upstream-ash.patch new file mode 100644 index 0000000000..c90e9d25c8 --- /dev/null +++ b/package/busybox/patches/000-upstream-ash.patch @@ -0,0 +1,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 { -- cgit v1.2.3