From owner-svn-src-stable@freebsd.org  Sat Oct 21 19:30:34 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 372BDE37F08;
 Sat, 21 Oct 2017 19:30:34 +0000 (UTC)
 (envelope-from oshogbo@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 05A4067BB8;
 Sat, 21 Oct 2017 19:30:33 +0000 (UTC)
 (envelope-from oshogbo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9LJUXFx015388;
 Sat, 21 Oct 2017 19:30:33 GMT (envelope-from oshogbo@FreeBSD.org)
Received: (from oshogbo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9LJUX3m015387;
 Sat, 21 Oct 2017 19:30:33 GMT (envelope-from oshogbo@FreeBSD.org)
Message-Id: <201710211930.v9LJUX3m015387@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to
 oshogbo@FreeBSD.org using -f
From: Mariusz Zaborski <oshogbo@FreeBSD.org>
Date: Sat, 21 Oct 2017 19:30:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r324828 - stable/11/sys/contrib/libnv
X-SVN-Group: stable-11
X-SVN-Commit-Author: oshogbo
X-SVN-Commit-Paths: stable/11/sys/contrib/libnv
X-SVN-Commit-Revision: 324828
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Oct 2017 19:30:34 -0000

Author: oshogbo
Date: Sat Oct 21 19:30:33 2017
New Revision: 324828
URL: https://svnweb.freebsd.org/changeset/base/324828

Log:
  MFC r323852:
  The 'while (array != NULL) { }' suggests scan-build that array may be
  initially NULL, which is not possible. Change the loop to
  'do {} while (array != NULL)' to satisfy scan-build and assert that
  array really cannot be NULL just in case.
  
  Submitted by:	pjd@
  Found by:	scan-build
  MFC after:	1 month
  Sponsored by:	Wheel Systems

Modified:
  stable/11/sys/contrib/libnv/nvlist.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/contrib/libnv/nvlist.c
==============================================================================
--- stable/11/sys/contrib/libnv/nvlist.c	Sat Oct 21 19:26:47 2017	(r324827)
+++ stable/11/sys/contrib/libnv/nvlist.c	Sat Oct 21 19:30:33 2017	(r324828)
@@ -1204,12 +1204,13 @@ nvlist_xunpack(const void *buf, size_t size, const int
 			    &array);
 			if (ptr == NULL)
 				goto failed;
+			PJDLOG_ASSERT(array != NULL);
 			tmpnvl = array;
-			while (array != NULL) {
+			do {
 				nvlist_set_parent(array, nvp);
 				array = __DECONST(nvlist_t *,
 				    nvlist_get_array_next(array));
-			}
+			} while (array != NULL);
 			ptr = nvlist_unpack_header(tmpnvl, ptr, nfds, &isbe,
 			    &left);
 			break;