diff options
| author | Nicolas Thill <nico@openwrt.org> | 2010-04-27 11:59:19 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2010-04-27 11:59:19 +0000 |
| commit | d19948df0540df8dbc989931135254c98a112591 (patch) | |
| tree | 4b7440db3eca3bdfdef4352b5635acb2e910c14e /package/busybox/patches/000-upstream-ash.patch | |
| parent | ab798095fa64005c6da0bc8ddc8ca3bba754e25a (diff) | |
| download | upstream-d19948df0540df8dbc989931135254c98a112591.tar.gz upstream-d19948df0540df8dbc989931135254c98a112591.tar.bz2 upstream-d19948df0540df8dbc989931135254c98a112591.zip | |
package/busybox: add 2 upstream fixes (ash & cpio), bumb release number
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21186 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox/patches/000-upstream-ash.patch')
| -rw-r--r-- | package/busybox/patches/000-upstream-ash.patch | 14 |
1 files changed, 14 insertions, 0 deletions
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 { |