mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

Merge branch '3176-issue-45110-by-clusterfuzz-external-bind9-dns_master_load_fuzzer-undefined-shift-in-soa_get' into 'main'

Browse Source 
Resolve "Issue 45110 by ClusterFuzz-External: bind9:dns_master_load_fuzzer: Undefined-shift in soa_get"

Closes #3176

See merge request isc-projects/bind9!5909
This commit is contained in:
Mark Andrews
2022-03-02 00:02:09 +00:00
parent f6453c1bc7 b8b99603f1
commit ed3dd45da8
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/dns/journal.c
View File

@@ -112,7 +112,8 @@ index_to_disk(dns_journal_t *);
static inline uint32_t
decode_uint32(unsigned char *p) {
return ((p[0] << 24) + (p[1] << 16) + (p[2] << 8) + (p[3] << 0));
return (((uint32_t)p[0] << 24) + ((uint32_t)p[1] << 16) +
((uint32_t)p[2] << 8) + ((uint32_t)p[3] << 0));
}
static inline void

5
lib/dns/rbtdb.c
View File

@@ -8517,8 +8517,9 @@ rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) {
#if DNS_RDATASET_FIXED
if ((rdataset->attributes & DNS_RDATASETATTR_LOADORDER) != 0) {
unsigned int offset;
offset = (raw[0] << 24) + (raw[1] << 16) + (raw[2] << 8) +
raw[3];
offset = ((unsigned int)raw[0] << 24) +
((unsigned int)raw[1] << 16) +
((unsigned int)raw[2] << 8) + (unsigned int)raw[3];
raw = rdataset->private3;
raw += offset;
}

3
lib/dns/soa.c
View File

@@ -25,7 +25,8 @@
static inline uint32_t
decode_uint32(unsigned char *p) {
return ((p[0] << 24) + (p[1] << 16) + (p[2] << 8) + (p[3] << 0));
return (((uint32_t)p[0] << 24) + ((uint32_t)p[1] << 16) +
((uint32_t)p[2] << 8) + ((uint32_t)p[3] << 0));
}
static inline void