]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Fix a crash where we don't care about option length.
authorRoy Marples <roy@marples.name>
Wed, 27 Nov 2013 21:14:43 +0000 (21:14 +0000)
committerRoy Marples <roy@marples.name>
Wed, 27 Nov 2013 21:14:43 +0000 (21:14 +0000)
dhcp-common.c

index 3e6ea0b0b488d350da38791dc252246df3c36931..917f5d2b9d33f936873dda79102386b5f92abb53 100644 (file)
@@ -116,7 +116,8 @@ dhcp_getuint32(uint32_t *i, const uint8_t *p, size_t pl)
        if (!p || pl < sizeof(d))
                return -1;
        memcpy(&d, p, sizeof(d));
-       *i = ntohl(d);
+       if (i)
+               *i = ntohl(d);
        return 0;
 }
 
@@ -128,7 +129,8 @@ dhcp_getuint16(uint16_t *i, const uint8_t *p, size_t pl)
        if (!p || pl < sizeof(d))
                return -1;
        memcpy(&d, p, sizeof(d));
-       *i = ntohs(d);
+       if (i)
+               *i = ntohs(d);
        return 0;
 }
 
@@ -138,7 +140,8 @@ dhcp_getuint8(uint8_t *i, const uint8_t *p, __unused size_t pl)
 
        if (!p)
                return -1;
-       *i = *(p);
+       if (i)
+               *i = *(p);
        return 0;
 }