Fix crash with empty DHCP string options.

This commit is contained in:
Simon Kelley
2013-07-02 21:19:32 +01:00
parent b4b9308079
commit 625ac28c61
2 changed files with 5 additions and 1 deletions

View File

@@ -1833,7 +1833,8 @@ static int do_opt(struct dhcp_opt *opt, unsigned char *p, struct dhcp_context *c
}
}
else
memcpy(p, opt->val, len);
/* empty string may be extended to "\0" by null_term */
memcpy(p, opt->val ? opt->val : (unsigned char *)"", len);
}
return len;
}