KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

busybox: fix hexdump segmentation fault with an empty leading format unit

Browse source 
SVN-Revision: 29156
This commit is contained in:
Jo-Philipp Wich 2011-11-15 17:38:55 +00:00
parent 817c72ef02
commit d0f5b51a8b
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/busybox/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=busybox PKG_NAME:=busybox
PKG_VERSION:=1.19.3 PKG_VERSION:=1.19.3
PKG_RELEASE:=5 PKG_RELEASE:=6
PKG_FLAGS:=essential PKG_FLAGS:=essential
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@ -72,6 +72,8 @@ ifdef CONFIG_BUSYBOX_USE_LIBRPC
LDLIBS += rpc LDLIBS += rpc
endif endif
TARGET_CFLAGS += -ggdb3
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \

11
package/busybox/patches/700-hexdump_segfault_fix.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -301,7 +301,7 @@ static NOINLINE void rewrite(priv_dumper
) {
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;