Merge pull request #2391 from keszybz/coverity

Coverity inspired fixes
2016-01-21 11:50:08 +01:00
parent 5c9ddf7ff4 2a836ca970
commit 9ecbcdffdf
9 changed files with 29 additions and 18 deletions
@@ -467,7 +467,7 @@ static int lease_parse_classless_routes(
                if (len < 4)
                        return -EINVAL;

-                lease_parse_be32(option, 4, &route->gw_addr.s_addr);
+                assert_se(lease_parse_be32(option, 4, &route->gw_addr.s_addr) >= 0);
                option += 4;
                len -= 4;

@@ -256,7 +256,7 @@ int dhcp6_lease_set_ntp(sd_dhcp6_lease *lease, uint8_t *optval, size_t optlen) {
        assert_return(lease, -EINVAL);
        assert_return(optval, -EINVAL);

-        free(lease->ntp);
+        lease->ntp = mfree(lease->ntp);
        lease->ntp_count = 0;
        lease->ntp_allocated = 0;