Date: Mon, 27 Nov 2017 02:44:36 +0000 (UTC) From: "Pedro F. Giffuni" <pfg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r326241 - stable/10/lib/libc/iconv Message-ID: <201711270244.vAR2ia0h083967@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Mon Nov 27 02:44:36 2017 New Revision: 326241 URL: https://svnweb.freebsd.org/changeset/base/326241 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/10/lib/libc/iconv/citrus_none.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/iconv/citrus_none.c ============================================================================== --- stable/10/lib/libc/iconv/citrus_none.c Mon Nov 27 02:43:27 2017 (r326240) +++ stable/10/lib/libc/iconv/citrus_none.c Mon Nov 27 02:44:36 2017 (r326241) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711270244.vAR2ia0h083967>