Module Name: src
Committed By: tnozaki
Date: Sat Nov 19 18:34:22 UTC 2011
Modified Files:
src/lib/libc/citrus: citrus_ctype.c citrus_iconv.c
Log Message:
return EINVAL when module validation failed, pointed by nonaka-san(again).
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/citrus/citrus_ctype.c
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/citrus/citrus_iconv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/citrus/citrus_ctype.c
diff -u src/lib/libc/citrus/citrus_ctype.c:1.5 src/lib/libc/citrus/citrus_ctype.c:1.6
--- src/lib/libc/citrus/citrus_ctype.c:1.5 Sat Jun 14 16:01:07 2008
+++ src/lib/libc/citrus/citrus_ctype.c Sat Nov 19 18:34:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_ctype.c,v 1.5 2008/06/14 16:01:07 tnozaki Exp $ */
+/* $NetBSD: citrus_ctype.c,v 1.6 2011/11/19 18:34:21 tnozaki Exp $ */
/*-
* Copyright (c)1999, 2000, 2001, 2002 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_ctype.c,v 1.5 2008/06/14 16:01:07 tnozaki Exp $");
+__RCSID("$NetBSD: citrus_ctype.c,v 1.6 2011/11/19 18:34:21 tnozaki Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -113,8 +113,10 @@ _initctypemodule(_citrus_ctype_t cc, cha
cc->cc_ops->co_wcstombs == NULL ||
cc->cc_ops->co_wctomb == NULL ||
cc->cc_ops->co_btowc == NULL ||
- cc->cc_ops->co_wctob == NULL)
+ cc->cc_ops->co_wctob == NULL) {
+ ret = EINVAL;
goto bad;
+ }
/* init and get closure */
ret = (*cc->cc_ops->co_init)(
Index: src/lib/libc/citrus/citrus_iconv.c
diff -u src/lib/libc/citrus/citrus_iconv.c:1.9 src/lib/libc/citrus/citrus_iconv.c:1.10
--- src/lib/libc/citrus/citrus_iconv.c:1.9 Wed Mar 30 08:22:01 2011
+++ src/lib/libc/citrus/citrus_iconv.c Sat Nov 19 18:34:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_iconv.c,v 1.9 2011/03/30 08:22:01 jruoho Exp $ */
+/* $NetBSD: citrus_iconv.c,v 1.10 2011/11/19 18:34:21 tnozaki Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_iconv.c,v 1.9 2011/03/30 08:22:01 jruoho Exp $");
+__RCSID("$NetBSD: citrus_iconv.c,v 1.10 2011/11/19 18:34:21 tnozaki Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -222,8 +222,10 @@ open_shared(struct _citrus_iconv_shared
ci->ci_ops->io_uninit_shared == NULL ||
ci->ci_ops->io_init_context == NULL ||
ci->ci_ops->io_uninit_context == NULL ||
- ci->ci_ops->io_convert == NULL)
+ ci->ci_ops->io_convert == NULL) {
+ ret = EINVAL;
goto err;
+ }
/* initialize the converter */
ret = (*ci->ci_ops->io_init_shared)(ci, basedir, src, dst,
