3518. [bug] Increase the size of dns_rrl_key.s.rtype by one bit

                        so that all dns_rrl_rtype_t enum values fit regardless
                        of whether it is teated as signed or unsigned by
                        the compiler. [RT #32792]

diff --git a/CHANGES b/CHANGES
index aeaea88166f9cc2e2672e04312fe111df8e60833..a102e7e62a2ea8240c1c15afcae9a6362a00ae7b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+3518.  [bug]           Increase the size of dns_rrl_key.s.rtype by one bit
+                       so that all dns_rrl_rtype_t enum values fit regardless
+                       of whether it is teated as signed or unsigned by
+                       the compiler. [RT #32792]
+
 3517.  [bug]           Reorder destruction to avoid shutdown race. [RT #32777]
 
 3516.  [placeholder]

diff --git a/lib/dns/include/dns/rrl.h b/lib/dns/include/dns/rrl.h
index 83c1655bb58888b630194a81123c51e30f0346fb..d6974b7387d0ba8c603f63c17e321ea6e25dc1b9 100644 (file)
--- a/lib/dns/include/dns/rrl.h
+++ b/lib/dns/include/dns/rrl.h
@@ -95,7 +95,7 @@ union dns_rrl_key {
                isc_uint32_t        qname_hash;
                dns_rdatatype_t     qtype;
                isc_uint8_t         qclass;
-               dns_rrl_rtype_t     rtype   :3;
+               dns_rrl_rtype_t     rtype   :4; /* 3 bits + sign bit */
                isc_boolean_t       ipv6    :1;
        } s;
        isc_uint16_t    w[1];