mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

Fix ASAN error in DoH (passing NULL to memmove())

Browse Source 
The warning was produced by an ASAN build:

runtime error: null pointer passed as argument 2, which is declared to
never be null

This commit fixes it by checking if nghttp2_session_mem_send() has
actually returned anything.
This commit is contained in:
Artem Boldariev
2021-06-14 23:25:03 +03:00
parent 629d8a3096
commit dc356bb196
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/isc/netmgr/http.c
View File

@@ -1025,6 +1025,13 @@ http_send_outgoing(isc_nm_http_session_t *session, isc_nmhandle_t *httphandle,
nghttp2_session_mem_send(session->ngsession, &data); nghttp2_session_mem_send(session->ngsession, &data);
const size_t new_total = total + pending; const size_t new_total = total + pending;
/* Sometimes nghttp2_session_mem_send() does not return any
* data to send even though nghttp2_session_want_write()
* returns success. */
if (pending == 0 || data == NULL) {
break;
}
/* reallocate buffer if required */ /* reallocate buffer if required */
if (new_total > sizeof(tmp_data)) { if (new_total > sizeof(tmp_data)) {
uint8_t *old_prepared_data = prepared_data; uint8_t *old_prepared_data = prepared_data;