From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 3 Feb 2012 15:43:33 +0000 (+0000)
Subject: [packages] libiconv: fix iconv() return value in E2BIG error case, fixes g_convert_wi... 
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=4c2b1d62937a5b0444068ac5bf0904e38adfb800;p=openwrt%2Fsvn-archive%2Farchive.git

[packages] libiconv: fix iconv() return value in E2BIG error case, fixes g_convert_with_iconv() and related operations


SVN-Revision: 30014
---

diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile
index 8a90ef1d6e..be8bc252c9 100644
--- a/libs/libiconv/Makefile
+++ b/libs/libiconv/Makefile
@@ -11,7 +11,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libiconv
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
diff --git a/libs/libiconv/src/iconv.c b/libs/libiconv/src/iconv.c
index 8dd5a0cb3a..cb4e947758 100644
--- a/libs/libiconv/src/iconv.c
+++ b/libs/libiconv/src/iconv.c
@@ -430,6 +430,7 @@ badf:
 	goto end;
 toobig:
 	err = E2BIG;
+	x = -1;
 	goto end;
 starved:
 	err = EINVAL;