Fix some possible leaks.

diff --git a/dhcp-common.c b/dhcp-common.c
index 5b8d15f470a0eee2f6b2fab90ca9f57b73729ed8..d877436a23319296f6784a1e850ce260bc477905 100644 (file)
--- a/dhcp-common.c
+++ b/dhcp-common.c
@@ -80,6 +80,7 @@ dhcp_vendor(char *str, size_t len)
        p += l;
        len -= (size_t)l;
        l = if_machinearch(p, len);
+       p += l;
        return (size_t)(p - str);
 }
 

diff --git a/if-options.c b/if-options.c
index 087d2af0bceddb1f68d056237db379b9cbf584a2..90a28a29ba5f0e731d5ddf15246c090995b2a92a 100644 (file)
--- a/if-options.c
+++ b/if-options.c
@@ -1675,6 +1675,7 @@ err_sla:
                token = malloc(sizeof(*token));
                if (token == NULL) {
                        syslog(LOG_ERR, "%s: %m", __func__);
+                       free(token);
                        return -1;
                }
                if (parse_uint32(&token->secretid, arg) == -1) {
@@ -1693,6 +1694,7 @@ err_sla:
                s = parse_string(NULL, 0, arg);
                if (s == -1) {
                        syslog(LOG_ERR, "realm_len: %m");
+                       free(token);
                        return -1;
                }
                if (s) {