Check length of synth-domain prefix.

This commit is contained in:
Simon Kelley
2013-04-25 11:03:47 +01:00
parent 48fd1c4dd6
commit b5a7ff42bb
2 changed files with 14 additions and 6 deletions

View File

@@ -1726,7 +1726,11 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
if (arg)
{
if (option != 's')
new->prefix = canonicalise_opt(arg);
{
if (!(new->prefix = canonicalise_opt(arg)) ||
strlen(new->prefix) > MAXLABEL - INET_ADDRSTRLEN)
ret_err(_("bad prefix"));
}
else if (strcmp(arg, "local") != 0 ||
(msize != 8 && msize != 16 && msize != 24))
ret_err(gen_err);
@@ -1783,7 +1787,11 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
else if (arg)
{
if (option != 's')
new->prefix = canonicalise_opt(arg);
{
if (!(new->prefix = canonicalise_opt(arg)) ||
strlen(new->prefix) > MAXLABEL - INET6_ADDRSTRLEN)
ret_err(_("bad prefix"));
}
else if (strcmp(arg, "local") != 0 || ((msize & 4) != 0))
ret_err(gen_err);
else