]> git.puffer.fish Git - matthieu/frr.git/commitdiff
ripd: Use correct usage of memcpy() when zeroing struct
authorDonatas Abraitis <donatas@opensourcerouting.org>
Wed, 11 May 2022 10:14:01 +0000 (13:14 +0300)
committerDonatas Abraitis <donatas@opensourcerouting.org>
Wed, 11 May 2022 11:08:46 +0000 (14:08 +0300)
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
ripd/ripd.c

index 2a05f30bc8c2613f336946f5a69f8717012ceff7..74a06b68939eff65f5c904797040b424460c56a7 100644 (file)
@@ -1287,10 +1287,9 @@ static void rip_response_process(struct rip_packet *packet, int size,
                        uint32_t destination;
 
                        if (subnetted == -1) {
-                               memcpy(&ifaddr, ifc->address,
-                                      sizeof(struct prefix_ipv4));
+                               memcpy(&ifaddr, ifc->address, sizeof(ifaddr));
                                memcpy(&ifaddrclass, &ifaddr,
-                                      sizeof(struct prefix_ipv4));
+                                      sizeof(ifaddrclass));
                                apply_classful_mask_ipv4(&ifaddrclass);
                                subnetted = 0;
                                if (ifaddr.prefixlen > ifaddrclass.prefixlen)
@@ -2103,7 +2102,7 @@ void rip_output_process(struct connected *ifc, struct sockaddr_in *to,
        }
 
        if (version == RIPv1) {
-               memcpy(&ifaddrclass, ifc->address, sizeof(struct prefix_ipv4));
+               memcpy(&ifaddrclass, ifc->address, sizeof(ifaddrclass));
                apply_classful_mask_ipv4(&ifaddrclass);
                subnetted = 0;
                if (ifc->address->prefixlen > ifaddrclass.prefixlen)