From 88044d5054a5a9ee1908c6ad4008b13d3884c0e1 Mon Sep 17 00:00:00 2001
From: tijl <tijl@FreeBSD.org>
Date: Tue, 1 Apr 2014 10:36:11 +0000
Subject: - In the libiconv module for ISO 2022 restore the original order of
 the   fields of a private struct such that variables of this type are  
 initialised correctly.  Fixes conversion from ISO 2022.   Also do this in the
 BIG5 module to prevent similar errors in the future. - In the libiconv module
 for EUC-TW replace 2^cs with 1<<cs.  Fixes   conversion from EUC-TW. -
 Synchronise iconv code with NetBSD.  In most cases this only updates   the
 RCS id because the changes are already there or are NetBSD specific.   +
 libc/iconv/citrus_csmapper.c: Add a comment.   +
 libc/iconv/citrus_db_factory.c: Remove put16().   +
 libc/iconv/citrus_iconv.c: Return EINVAL on error.   +
 libc/iconv/citrus_mapper.c: Return EINVAL on error.   +
 libc/iconv/citrus_memstream.c: Fix type of a variable.   +
 libc/iconv/citrus_prop.h: Sync definition of _CITRUS_PROP_HINT_END.   +
 libc/iconv/citrus_stdenc.c: Return EINVAL on error.   +
 libiconv_modules/mapper_std/citrus_mapper_std.c: Plug memory leak.

Obtained from:	NetBSD
MFC after:	2 weeks
---
 lib/libc/iconv/citrus_stdenc.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/libc/iconv/citrus_stdenc.c')

diff --git a/lib/libc/iconv/citrus_stdenc.c b/lib/libc/iconv/citrus_stdenc.c
index b6562f8..cef530e 100644
--- a/lib/libc/iconv/citrus_stdenc.c
+++ b/lib/libc/iconv/citrus_stdenc.c
@@ -1,5 +1,5 @@
 /* $FreeBSD$ */
-/* $NetBSD: citrus_stdenc.c,v 1.3 2005/10/29 18:02:04 tshiozak Exp $ */
+/*	$NetBSD: citrus_stdenc.c,v 1.4 2011/11/19 18:39:58 tnozaki Exp $	*/
 
 /*-
  * Copyright (c)2003 Citrus Project,
@@ -102,8 +102,10 @@ _citrus_stdenc_open(struct _citrus_stdenc * __restrict * __restrict rce,
 	    ce->ce_ops->eo_cstomb == NULL ||
 	    ce->ce_ops->eo_mbtowc == NULL ||
 	    ce->ce_ops->eo_wctomb == NULL ||
-	    ce->ce_ops->eo_get_state_desc == NULL)
+	    ce->ce_ops->eo_get_state_desc == NULL) {
+		ret = EINVAL;
 		goto bad;
+	}
 
 	/* allocate traits */
 	ce->ce_traits = malloc(sizeof(*ce->ce_traits));
-- 
cgit v1.1