From owner-svn-src-stable@freebsd.org  Fri Jun 10 15:42:18 2016
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 5FEB4B715FF;
 Fri, 10 Jun 2016 15:42:18 +0000 (UTC)
 (envelope-from ngie@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 313F51814;
 Fri, 10 Jun 2016 15:42:18 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5AFgHP6070263;
 Fri, 10 Jun 2016 15:42:17 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5AFgHks070262;
 Fri, 10 Jun 2016 15:42:17 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201606101542.u5AFgHks070262@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 10 Jun 2016 15:42:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r301798 - stable/10/lib/libc/tests/nss
X-SVN-Group: stable-10
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.22
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: Fri, 10 Jun 2016 15:42:18 -0000

Author: ngie
Date: Fri Jun 10 15:42:17 2016
New Revision: 301798
URL: https://svnweb.freebsd.org/changeset/base/301798

Log:
  MFC r299502:
  r299502 (by cem):
  
  nss/gethostby_test: fix broken vector iteration of gethostbyaddr h_aliases
  
  h_aliases is a NULL-terminated rather than fixed-length array.  nitems() is not
  a valid way to determine its end; instead, check for NULL.
  
  CID:		1346578

Modified:
  stable/10/lib/libc/tests/nss/gethostby_test.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/tests/nss/gethostby_test.c
==============================================================================
--- stable/10/lib/libc/tests/nss/gethostby_test.c	Fri Jun 10 15:05:35 2016	(r301797)
+++ stable/10/lib/libc/tests/nss/gethostby_test.c	Fri Jun 10 15:42:17 2016	(r301798)
@@ -893,7 +893,7 @@ hostent_test_getnameinfo_eq(struct hoste
 			printf("matched official hostname\n");
 #endif
 		} else {
-			for (i = 0; i < nitems(result->h_aliases); i++) {
+			for (i = 0; result->h_aliases[i] != NULL; i++) {
 				printf("[%d] resolved: %s\n", i,
 				    result->h_aliases[i]);
 				if (strcmp(result->h_aliases[i],