d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iconv: Fix a pointer mismatch.

Browse Source 
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
This commit is contained in:
Pedro F. Giffuni 2017-11-20 20:05:30 +00:00
parent 981e34b9ca
commit 2b61d29172
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libc/iconv/citrus_none.c
View File

@ -164,7 +164,7 @@ _citrus_NONE_stdenc_mbtowc(struct _citrus_stdenc * __restrict ce __unused,
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 * __restrict ce __unused,
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);