[packages] libiconv: fix iconv() return value in E2BIG error case, fixes g_convert_wi...

git-svn-id: svn://svn.openwrt.org/openwrt/packages@30014 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile
index 8a90ef1..be8bc25 100644 (file)
--- 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 8dd5a0c..cb4e947 100644 (file)
--- 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;