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

SVN-Revision: 30014

diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile
index 8a90ef1d6e60f907eac64a817135db2c185fd777..be8bc252c9bfd9da8affcadfd3b6460ad40c3463 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 8dd5a0cb3abbc1e62f3bd97fb10c3b22d657e6a2..cb4e947758c1c4ee2e18934bb0c4fda0cd563573 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;