1
1

Okay to return an error on end=start of string conversion so long as the strlen > 0, so restore that error check.

This commit was SVN r24756.
Этот коммит содержится в:
Ralph Castain 2011-06-07 03:20:01 +00:00
родитель f3cae3d6f3
Коммит 666fdeab8f

Просмотреть файл

@ -497,19 +497,19 @@ static uint32_t parse_ipv4_dots(const char *addr, uint32_t* net, int* dots)
int i, rc = OPAL_SUCCESS; int i, rc = OPAL_SUCCESS;
/* now assemble the address */ /* now assemble the address */
for( i = 0; i < 4; i++ ) { for( i = 0; i < 4 && 0 < strlen(start); i++ ) {
n[i] = strtoul(start, (char**)&end, 10); n[i] = strtoul(start, (char**)&end, 10);
if( end == start ) { /* error case: use what we have so far */ if( end == start ) { /* error case: use what we have so far */
rc = OPAL_SUCCESS; rc = OPAL_ERR_NETWORK_NOT_PARSEABLE;
break; break;
} }
/* skip all the . */
for( start = end; '\0' != *start; start++ )
if( '.' != *start ) break;
/* did we read something sensible? */ /* did we read something sensible? */
if( n[i] > 255 ) { if( n[i] > 255 ) {
return OPAL_ERR_NETWORK_NOT_PARSEABLE; return OPAL_ERR_NETWORK_NOT_PARSEABLE;
} }
/* skip all the . */
for( start = end; '\0' != *start; start++ )
if( '.' != *start ) break;
} }
*dots = i; *dots = i;
*net = OPAL_IF_ASSEMBLE_NETWORK(n[0], n[1], n[2], n[3]); *net = OPAL_IF_ASSEMBLE_NETWORK(n[0], n[1], n[2], n[3]);