options: Don't assume vsio options have an argument (#578)

* options: Don't assume vsio options have an argument

Should fix #577.

diff --git a/src/if-options.c b/src/if-options.c
index b55e65d6c97dd7383144122696f9b743aaaf03bb..60f8e660651cd09195517ad1e35ee1761a45a5a3 100644 (file)
--- a/src/if-options.c
+++ b/src/if-options.c
@@ -936,7 +936,7 @@ parse_option(struct dhcpcd_ctx *ctx, const char *ifname, struct if_options *ifo,
                return -1;
 #else
                fp = strwhite(arg);
-               if (fp)
+               if (fp != NULL)
                        *fp++ = '\0';
                u = (uint32_t)strtou(arg, NULL, 0, 0, UINT32_MAX, &e);
                if (e) {
@@ -944,9 +944,13 @@ parse_option(struct dhcpcd_ctx *ctx, const char *ifname, struct if_options *ifo,
                        return -1;
                }
 
-               fp = strskipwhite(fp);
-               p = strchr(fp, ',');
-               if (!p || !p[1]) {
+               if (fp != NULL)
+                       fp = strskipwhite(fp);
+               if (fp != NULL)
+                       p = strchr(fp, ',');
+               else
+                       p = NULL;
+               if (p == NULL || p[1] == '\0') {
                        logerrx("invalid vendor format: %s", arg);
                        return -1;
                }