From owner-svn-src-stable@freebsd.org Thu Jun 1 06:17:02 2017 Return-Path: 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 86D24B7AA7B; Thu, 1 Jun 2017 06:17:02 +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 5509564F15; Thu, 1 Jun 2017 06:17:02 +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 v516H1ED068202; Thu, 1 Jun 2017 06:17:01 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v516H1Pj068200; Thu, 1 Jun 2017 06:17:01 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201706010617.v516H1Pj068200@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Thu, 1 Jun 2017 06:17:01 +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: r319371 - stable/11/lib/libnv/tests X-SVN-Group: stable-11 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jun 2017 06:17:02 -0000 Author: ngie Date: Thu Jun 1 06:17:01 2017 New Revision: 319371 URL: https://svnweb.freebsd.org/changeset/base/319371 Log: MFC r319156,r319159: r319156: :nvlist_unpack__duplicate_key : check the result of nvlist_pack(3) This fixes a potential NULL pointer dereference. CID: 1362051 r319159: :dnvlist_get_string__default_value: fix a bogus string comparison test Check actual_value vs "5", not "5" vs itself. CID: 1362021 Modified: stable/11/lib/libnv/tests/dnv_tests.cc stable/11/lib/libnv/tests/nv_tests.cc Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libnv/tests/dnv_tests.cc ============================================================================== --- stable/11/lib/libnv/tests/dnv_tests.cc Thu Jun 1 06:16:57 2017 (r319370) +++ stable/11/lib/libnv/tests/dnv_tests.cc Thu Jun 1 06:17:01 2017 (r319371) @@ -150,7 +150,7 @@ ATF_TEST_CASE_BODY(dnvlist_get_string__default_value) ATF_REQUIRE_EQ(strcmp(dnvlist_get_string(nvl, "hthth", "fd"), "fd"), 0); actual_value = dnvlist_get_string(nvl, "5", "5"); - ATF_REQUIRE_EQ(strcmp("5", "5"), 0); + ATF_REQUIRE_EQ(strcmp(actual_value, "5"), 0); nvlist_destroy(nvl); } Modified: stable/11/lib/libnv/tests/nv_tests.cc ============================================================================== --- stable/11/lib/libnv/tests/nv_tests.cc Thu Jun 1 06:16:57 2017 (r319370) +++ stable/11/lib/libnv/tests/nv_tests.cc Thu Jun 1 06:17:01 2017 (r319371) @@ -640,6 +640,7 @@ ATF_TEST_CASE_BODY(nvlist_unpack__duplicate_key) nvlist_add_number(nvl, key2, 10); packed = nvlist_pack(nvl, &size); + ATF_REQUIRE(packed != NULL); /* * Mangle the packed nvlist by replacing key1 with key2, creating a