]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Fix unchecked returns of dns_name_fromtext
authorMark Andrews <marka@isc.org>
Wed, 7 Jul 2021 05:50:02 +0000 (15:50 +1000)
committerMark Andrews <marka@isc.org>
Mon, 12 Jul 2021 03:26:29 +0000 (13:26 +1000)
(cherry picked from commit 8538c762cb218839906abcdd05213d44783de306)

lib/dns/tests/rbtdb_test.c

index a92b4bd8af9f9f68ef561121bd0d7d88b3df89e0..7531ef717502a89ea4cca18969244f23003f23e5 100644 (file)
@@ -108,6 +108,7 @@ const char *ownercase_vectors[12][2] = {
 
 static bool
 ownercase_test_one(const char *str1, const char *str2) {
+       isc_result_t result;
        rbtdb_nodelock_t node_locks[1];
        dns_rbtdb_t rbtdb = { .node_locks = node_locks };
        dns_rbtnode_t rbtnode = { .locknum = 0 };
@@ -132,12 +133,14 @@ ownercase_test_one(const char *str1, const char *str2) {
        name1 = dns_fixedname_initname(&fname1);
        isc_buffer_constinit(&b, str1, strlen(str1));
        isc_buffer_add(&b, strlen(str1));
-       dns_name_fromtext(name1, &b, dns_rootname, 0, NULL);
+       result = dns_name_fromtext(name1, &b, dns_rootname, 0, NULL);
+       assert_int_equal(result, ISC_R_SUCCESS);
 
        name2 = dns_fixedname_initname(&fname2);
        isc_buffer_constinit(&b, str2, strlen(str2));
        isc_buffer_add(&b, strlen(str2));
-       dns_name_fromtext(name2, &b, dns_rootname, 0, NULL);
+       result = dns_name_fromtext(name2, &b, dns_rootname, 0, NULL);
+       assert_int_equal(result, ISC_R_SUCCESS);
 
        /* Store the case from name1 */
        dns_rdataset_setownercase(&rdataset, name1);
@@ -169,6 +172,7 @@ ownercase_test(void **state) {
 
 static void
 setownercase_test(void **state) {
+       isc_result_t result;
        rbtdb_nodelock_t node_locks[1];
        dns_rbtdb_t rbtdb = { .node_locks = node_locks };
        dns_rbtnode_t rbtnode = { .locknum = 0 };
@@ -197,12 +201,14 @@ setownercase_test(void **state) {
        name1 = dns_fixedname_initname(&fname1);
        isc_buffer_constinit(&b, str1, strlen(str1));
        isc_buffer_add(&b, strlen(str1));
-       dns_name_fromtext(name1, &b, dns_rootname, 0, NULL);
+       result = dns_name_fromtext(name1, &b, dns_rootname, 0, NULL);
+       assert_int_equal(result, ISC_R_SUCCESS);
 
        name2 = dns_fixedname_initname(&fname2);
        isc_buffer_constinit(&b, str1, strlen(str1));
        isc_buffer_add(&b, strlen(str1));
-       dns_name_fromtext(name2, &b, dns_rootname, 0, NULL);
+       result = dns_name_fromtext(name2, &b, dns_rootname, 0, NULL);
+       assert_int_equal(result, ISC_R_SUCCESS);
 
        assert_false(CASESET(&header));