util/uri: Add overflow check to rfc3986_parse_port

And while at it, replace tabs by eight spaces in this function.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <1424887718-10800-2-git-send-email-mreitz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Max Reitz 2015-02-25 13:08:14 -05:00 committed by Paolo Bonzini
parent 8b2f0abfd6
commit 2b21233061
1 changed files with 14 additions and 10 deletions

View File

@ -320,19 +320,23 @@ static int
rfc3986_parse_port(URI *uri, const char **str)
{
const char *cur = *str;
int port = 0;
if (ISA_DIGIT(cur)) {
if (uri != NULL)
uri->port = 0;
while (ISA_DIGIT(cur)) {
if (uri != NULL)
uri->port = uri->port * 10 + (*cur - '0');
cur++;
}
*str = cur;
return(0);
while (ISA_DIGIT(cur)) {
port = port * 10 + (*cur - '0');
if (port > 65535) {
return 1;
}
cur++;
}
if (uri) {
uri->port = port;
}
*str = cur;
return 0;
}
return(1);
return 1;
}
/**