From owner-svn-src-all@freebsd.org  Mon Nov 20 20:05:31 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A7EBDDF4470;
 Mon, 20 Nov 2017 20:05:31 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 750C66AFB6;
 Mon, 20 Nov 2017 20:05:31 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAKK5UWG042765;
 Mon, 20 Nov 2017 20:05:30 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAKK5UhN042764;
 Mon, 20 Nov 2017 20:05:30 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711202005.vAKK5UhN042764@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 20 Nov 2017 20:05:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326028 - head/lib/libc/iconv
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: head/lib/libc/iconv
X-SVN-Commit-Revision: 326028
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Nov 2017 20:05:31 -0000

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);