[SCM] Resolv Wrapper Repository - branch master updated

Andreas Schneider asn at samba.org
Fri Mar 20 14:00:55 UTC 2020


The branch, master has been updated
       via  fef7aa9 gitlab-ci: Whitelist metze to use the FreeBSD runner
       via  340d629 tests: Fix memory overrun
      from  f34b454 rwrap: make use of res_{get,set}servers() for FreeBSD

https://git.samba.org/?p=resolv_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fef7aa9afc21d8df7ec1e17d5df8fcc32a37976b
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Mar 20 14:23:24 2020 +0100

    gitlab-ci: Whitelist metze to use the FreeBSD runner
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

commit 340d6294f09664734f5535d582b2bd11b4eee401
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Mar 20 13:49:20 2020 +0100

    tests: Fix memory overrun
    
    16-byte array and size 256 doesn't work very well.
    
    CID 274185
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 .gitlab-ci.yml        | 1 +
 tests/test_dns_fake.c | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4fe2971..90558b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -128,6 +128,7 @@ freebsd/x86_64:
   only:
   - branches at cwrap/resolv_wrapper
   - branches at cryptomilk/resolv_wrapper
+  - branches at metze/resolv_wrapper
   artifacts:
     expire_in: 1 week
     when: on_failure
diff --git a/tests/test_dns_fake.c b/tests/test_dns_fake.c
index 420d32b..121ccbc 100644
--- a/tests/test_dns_fake.c
+++ b/tests/test_dns_fake.c
@@ -138,7 +138,7 @@ static void test_res_fake_a_query_trailing_dot(void **state)
 			answer, ANSIZE);
 	assert_in_range(rv, 1, 100);
 
-	ns_initparse(answer, 256, &handle);
+	ns_initparse(answer, sizeof(answer), &handle);
 	/* The query must finish w/o an error, have one answer and the answer
 	 * must be a parseable RR of type A and have the address that our
 	 * fake hosts file contains
@@ -147,7 +147,8 @@ static void test_res_fake_a_query_trailing_dot(void **state)
 	assert_int_equal(ns_msg_count(handle, ns_s_an), 1);
 	assert_int_equal(ns_parserr(&handle, ns_s_an, 0, &rr), 0);
 	assert_int_equal(ns_rr_type(rr), ns_t_a);
-	assert_non_null(inet_ntop(AF_INET, ns_rr_rdata(rr), addr, 256));
+	assert_non_null(inet_ntop(AF_INET, ns_rr_rdata(rr), addr, sizeof(addr)));
+
 	assert_string_equal(addr, "127.0.0.21");
 
 	res_nclose(&dnsstate);


-- 
Resolv Wrapper Repository



More information about the samba-cvs mailing list