From 972f46eefa2985a8c3ca779b3c45f7ca7c9f13df Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 3 Feb 2012 15:43:33 +0000 Subject: [PATCH] libiconv: fix iconv() return value in E2BIG error case, fixes g_convert_with_iconv() and related operations SVN-Revision: 30014 --- libs/libiconv/Makefile | 2 +- libs/libiconv/src/iconv.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile index 8a90ef1d6..be8bc252c 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 8dd5a0cb3..cb4e94775 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; -- 2.30.2