Author: pfg
Date: Mon Nov 27 02:43:27 2017
New Revision: 326240
URL: https://svnweb.freebsd.org/changeset/base/326240
Log:
MFC r326028:
iconv: Fix a pointer mismatch.
Catch NULL pointer earlier, check for empty string later.
Apparently this fixes a GCC8 warning.
Obtained from: NetBSD (CVS Rev. 1.21, 1.22) through DragonFlyBSD
Modified:
stable/11/lib/libc/iconv/citrus_none.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/lib/libc/iconv/citrus_none.c
==============================================================================
--- stable/11/lib/libc/iconv/citrus_none.c Mon Nov 27 02:28:40 2017
(r326239)
+++ stable/11/lib/libc/iconv/citrus_none.c Mon Nov 27 02:43:27 2017
(r326240)
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/* $NetBSD: citrus_none.c,v 1.18 2008/06/14 16:01:07 tnozaki Exp $ */
+/* $NetBSD: citrus_none.c,v 1.22 2017/07/13 16:00:30 christos Exp $
*/
/*-
* Copyright (c) 2002 Citrus Project,
@@ -164,7 +164,7 @@ _citrus_NONE_stdenc_mbtowc(struct _citrus_stdenc * __r
struct iconv_hooks *hooks)
{
- if (s == NULL) {
+ if (*s == NULL) {
*nresult = 0;
return (0);
}
@@ -176,7 +176,7 @@ _citrus_NONE_stdenc_mbtowc(struct _citrus_stdenc * __r
if (pwc != NULL)
*pwc = (_wc_t)(unsigned char) **s;
- *nresult = *s == '\0' ? 0 : 1;
+ *nresult = **s == '\0' ? 0 : 1;
if ((hooks != NULL) && (hooks->wc_hook != NULL))
hooks->wc_hook(*pwc, hooks->data);
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
