ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '2053-test-disable-buffer-useinline-in-gitlab-ci-v9_16' into 'v9_16'

Browse Source 
[v9_16] Resolve "Test --disable-buffer-useinline in GitLab CI"

See merge request isc-projects/bind9!4012
This commit is contained in:
Michal Nowak
2020-08-25 14:28:35 +00:00
parent 92d4a23f28 a0e55857c7
commit fbcff0ab14
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -593,7 +593,7 @@ gcc:centos8:amd64:
variables:
CC: gcc
CFLAGS: "${CFLAGS_COMMON}"
EXTRA_CONFIGURE: "--with-libidn2"
EXTRA_CONFIGURE: "--enable-buffer-useinline --with-libidn2"
<<: *centos_centos8_amd64_image
<<: *build_job

3
lib/dns/rdata.c
View File

@@ -1777,7 +1777,8 @@ inet_totext(int af, uint32_t flags, isc_region_t *src, isc_buffer_t *target) {
if (isc_buffer_availablelength(target) == 0) {
return (ISC_R_NOSPACE);
}
isc_buffer_putmem(target, "0", 1);
isc_buffer_putmem(target, (const unsigned char *)"0",
1);
}
}

5
lib/isc/sockaddr.c
View File

@@ -144,7 +144,10 @@ isc_sockaddr_totext(const isc_sockaddr_t *sockaddr, isc_buffer_t *target) {
return (ISC_R_NOSPACE);
}
isc_buffer_putmem(target, sockaddr->type.sunix.sun_path, plen);
isc_buffer_putmem(
target,
(const unsigned char *)sockaddr->type.sunix.sun_path,
plen);
/*
* Null terminate after used region.