svn commit: r324828 - stable/11/sys/contrib/libnv

[Mariusz Zaborski]

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;