network-address,test-network: avoid undefined behaviour

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index ce0e923cbe035092f362ec4d8a42396c8f921aa6..47033acde4e1fab18fcb32e764d13a53707fcf12 100644 (file)
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -592,6 +592,10 @@ bool address_equal(Address *a1, Address *a2) {
         case AF_INET:
                 if (a1->prefixlen != a2->prefixlen)
                         return false;
         case AF_INET:
                 if (a1->prefixlen != a2->prefixlen)
                         return false;

+                else if (a1->prefixlen == 0)
+                        /* make sure we don't try to shift by 32.
+                         * See ISO/IEC 9899:TC3 § 6.5.7.3. */
+                        return true;

                 else {
                         uint32_t b1, b2;
 
                 else {
                         uint32_t b1, b2;
 

diff --git a/src/network/test-network.c b/src/network/test-network.c
index ea9f93864918d2f9cda1a1708b20db247c27c38b..b4a7be00f5810f547d4a71dda1dba37f33b7a283 100644 (file)
--- a/src/network/test-network.c
+++ b/src/network/test-network.c
@@ -158,10 +158,9 @@ static void test_address_equality(void) {
         assert_se(address_equal(a1, a2));
 
         assert_se(inet_pton(AF_INET, "192.168.3.9", &a1->in_addr.in));
         assert_se(address_equal(a1, a2));
 
         assert_se(inet_pton(AF_INET, "192.168.3.9", &a1->in_addr.in));

-        assert_se(!address_equal(a1, a2));
+        assert_se(address_equal(a1, a2));

         assert_se(inet_pton(AF_INET, "192.168.3.9", &a2->in_addr.in));
         assert_se(address_equal(a1, a2));
         assert_se(inet_pton(AF_INET, "192.168.3.9", &a2->in_addr.in));
         assert_se(address_equal(a1, a2));

-

         a1->prefixlen = 10;
         assert_se(!address_equal(a1, a2));
         a2->prefixlen = 10;
         a1->prefixlen = 10;
         assert_se(!address_equal(a1, a2));
         a2->prefixlen = 10;