mirror of
https://github.com/isc-projects/bind9.git
synced 2026-07-16 20:02:49 -04:00
Merge branch '2455-tcpdns_test-c-runtime-error-load-of-misaligned-address-for-type-uint64_t-v9_16' into 'v9_16'
Assigning uint64_t from buffer might be misaligned in netmgr tests See merge request isc-projects/bind9!4773
This commit is contained in:
commit
d714c48be0
5 changed files with 10 additions and 10 deletions
|
|
@ -258,7 +258,7 @@ tcp_connect_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
|
|||
|
||||
atomic_fetch_add(&creads, 1);
|
||||
|
||||
magic = *(uint64_t *)tcp_buffer_storage;
|
||||
memmove(&magic, tcp_buffer_storage, sizeof(magic));
|
||||
assert_true(magic == stop_magic || magic == send_magic);
|
||||
|
||||
tcp_buffer_length -= sizeof(magic);
|
||||
|
|
@ -649,7 +649,7 @@ tcp_listen_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
|
|||
if (tcp_buffer_length >= sizeof(magic)) {
|
||||
isc_nm_pauseread(handle);
|
||||
|
||||
magic = *(uint64_t *)tcp_buffer_storage;
|
||||
memmove(&magic, tcp_buffer_storage, sizeof(magic));
|
||||
assert_true(magic == stop_magic || magic == send_magic);
|
||||
|
||||
tcp_buffer_length -= sizeof(magic);
|
||||
|
|
|
|||
|
|
@ -287,7 +287,7 @@ tcp_connect_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
|
|||
while (tcp_buffer_length >= sizeof(magic)) {
|
||||
atomic_fetch_add(&creads, 1);
|
||||
|
||||
magic = *(uint64_t *)tcp_buffer_storage;
|
||||
memmove(&magic, tcp_buffer_storage, sizeof(magic));
|
||||
assert_true(magic == stop_magic || magic == send_magic);
|
||||
|
||||
tcp_buffer_length -= sizeof(magic);
|
||||
|
|
@ -957,7 +957,7 @@ tcp_listen_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
|
|||
tcp_buffer_length += region->length;
|
||||
|
||||
while (tcp_buffer_length >= sizeof(magic)) {
|
||||
magic = *(uint64_t *)tcp_buffer_storage;
|
||||
memmove(&magic, tcp_buffer_storage, sizeof(magic));
|
||||
assert_true(magic == stop_magic || magic == send_magic);
|
||||
|
||||
tcp_buffer_length -= sizeof(magic);
|
||||
|
|
|
|||
|
|
@ -325,7 +325,7 @@ tcpdns_connect_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
|
|||
|
||||
atomic_fetch_add(&creads, 1);
|
||||
|
||||
magic = *(uint64_t *)region->base;
|
||||
memmove(&magic, region->base, sizeof(magic));
|
||||
|
||||
assert_true(magic == stop_magic || magic == send_magic);
|
||||
|
||||
|
|
@ -475,7 +475,7 @@ tcpdns_listen_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
|
|||
|
||||
assert_int_equal(region->length, sizeof(magic));
|
||||
|
||||
magic = *(uint64_t *)region->base;
|
||||
memmove(&magic, region->base, sizeof(magic));
|
||||
assert_true(magic == stop_magic || magic == send_magic);
|
||||
|
||||
if (magic == send_magic) {
|
||||
|
|
|
|||
|
|
@ -335,7 +335,7 @@ tlsdns_connect_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
|
|||
|
||||
atomic_fetch_add(&creads, 1);
|
||||
|
||||
magic = *(uint64_t *)region->base;
|
||||
memmove(&magic, region->base, sizeof(magic));
|
||||
|
||||
assert_true(magic == stop_magic || magic == send_magic);
|
||||
|
||||
|
|
@ -487,7 +487,7 @@ tlsdns_listen_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
|
|||
|
||||
assert_int_equal(region->length, sizeof(magic));
|
||||
|
||||
magic = *(uint64_t *)region->base;
|
||||
memmove(&magic, region->base, sizeof(magic));
|
||||
assert_true(magic == stop_magic || magic == send_magic);
|
||||
|
||||
if (magic == send_magic) {
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ udp_listen_recv_cb(isc_nmhandle_t *handle, isc_result_t eresult,
|
|||
|
||||
assert_int_equal(region->length, sizeof(send_magic));
|
||||
atomic_fetch_add(&sreads, 1);
|
||||
magic = *(uint64_t *)region->base;
|
||||
memmove(&magic, region->base, sizeof(magic));
|
||||
|
||||
assert_true(magic == stop_magic || magic == send_magic);
|
||||
isc_nm_send(handle, region, udp_listen_send_cb, NULL);
|
||||
|
|
@ -552,7 +552,7 @@ udp_connect_recv_cb(isc_nmhandle_t *handle, isc_result_t eresult,
|
|||
|
||||
atomic_fetch_add(&creads, 1);
|
||||
|
||||
magic = *(uint64_t *)region->base;
|
||||
memmove(&magic, region->base, sizeof(magic));
|
||||
|
||||
assert_true(magic == stop_magic || magic == send_magic);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue