diff options
| author | ngie <ngie@FreeBSD.org> | 2017-06-01 06:16:57 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-06-01 06:16:57 +0000 |
| commit | 9edae7b8d9abd5573a8fc114ebea24b3e9bc7908 (patch) | |
| tree | 3840df1fa472a7c518879fb0a89030c1e52bb48a /lib | |
| parent | 519edc34143e0084b8090e5b8c43ec94979cc3ac (diff) | |
| download | FreeBSD-src-9edae7b8d9abd5573a8fc114ebea24b3e9bc7908.zip FreeBSD-src-9edae7b8d9abd5573a8fc114ebea24b3e9bc7908.tar.gz | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libnv/tests/dnv_tests.cc | 2 | ||||
| -rw-r--r-- | lib/libnv/tests/nv_tests.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/libnv/tests/dnv_tests.cc b/lib/libnv/tests/dnv_tests.cc index 2f92d9d..bd7805a 100644 --- a/lib/libnv/tests/dnv_tests.cc +++ b/lib/libnv/tests/dnv_tests.cc @@ -148,7 +148,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); } diff --git a/lib/libnv/tests/nv_tests.cc b/lib/libnv/tests/nv_tests.cc index 2d9fd97..749dc2e 100644 --- a/lib/libnv/tests/nv_tests.cc +++ b/lib/libnv/tests/nv_tests.cc @@ -605,6 +605,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 |
