Author: pfg
Date: Mon Nov 20 20:05:30 2017
New Revision: 326028
URL: https://svnweb.freebsd.org/changeset/base/326028
Log:
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
MFC after: 1 week
Modified:
head/lib/libc/iconv/citrus_none.c
Modified: head/lib/libc/iconv/citrus_none.c
==============================================================================
--- head/lib/libc/iconv/citrus_none.c Mon Nov 20 19:56:11 2017
(r326027)
+++ head/lib/libc/iconv/citrus_none.c Mon Nov 20 20:05:30 2017
(r326028)
@@ -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);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
