upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-10 22:50:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '3761-ubsan-error-in-isc_buffer_reserve' into 'main'

Browse source 
Resolve "UBSAN error in isc_buffer_reserve"

Closes #3761

See merge request isc-projects/bind9!7285
This commit is contained in:
Mark Andrews 2023-01-03 07:30:21 +00:00
commit 2e1e398e7d
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/isc/include/isc/buffer.h
View file

@ -1150,7 +1150,9 @@ isc_buffer_reserve(isc_buffer_t *restrict dbuf, const unsigned int size) {
if (!dbuf->dynamic) {
void *old_base = dbuf->base;
dbuf->base = isc_mem_get(dbuf->mctx, len);
memmove(dbuf->base, old_base, dbuf->used);
if (old_base != NULL) {
memmove(dbuf->base, old_base, dbuf->used);
}
dbuf->dynamic = true;
} else {
dbuf->base = isc_mem_reget(dbuf->mctx, dbuf->base, dbuf->length,