From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 15 Nov 2011 17:55:01 +0000 (+0000)
Subject: busybox: backport r29156
X-Git-Tag: backfire_10.03.1~50
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=80882ad23623c403a51312ae0c5d482dbac89cd1;p=openwrt%2Fsvn-archive%2Fopenwrt.git

busybox: backport r29156

SVN-Revision: 29159
---

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 3289bd679e..0706480b6b 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
 PKG_VERSION:=1.15.3
-PKG_RELEASE:=3.2
+PKG_RELEASE:=3.3
 PKG_FLAGS:=essential
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/package/busybox/patches/700-hexdump_segfault_fix.patch b/package/busybox/patches/700-hexdump_segfault_fix.patch
new file mode 100644
index 0000000000..9bb9ad88df
--- /dev/null
+++ b/package/busybox/patches/700-hexdump_segfault_fix.patch
@@ -0,0 +1,11 @@
+--- a/libbb/dump.c
++++ b/libbb/dump.c
+@@ -304,7 +304,7 @@ static void rewrite(priv_dumper_t *dumpe
+ 		) {
+ 			fu->reps += (dumper->blocksize - fs->bcnt) / fu->bcnt;
+ 		}
+-		if (fu->reps > 1) {
++		if (fu->reps > 1 && fu->nextpr) {
+ 			for (pr = fu->nextpr;; pr = pr->nextpr)
+ 				if (!pr->nextpr)
+ 					break;