Fix ITS#4505

This commit is contained in:
Howard Chu 2006-04-26 09:12:40 +00:00
parent e8e153e4a8
commit 0836354d1e

View file

@ -396,12 +396,16 @@ log_age_parse(char *agestr)
return -1; return -1;
t1 *= 24; t1 *= 24;
gotdays = 1; gotdays = 1;
} else if ( *endptr != ':' ) { agestr = endptr + 1;
/* No valid delimiter found, fail */ } else {
return -1; if ( agestr[2] != ':' ) {
/* No valid delimiter found, fail */
return -1;
}
t1 *= 60;
agestr += 3;
} }
agestr = endptr + 1;
t2 = atoi( agestr ); t2 = atoi( agestr );
/* if there's a delimiter, it can only be a colon */ /* if there's a delimiter, it can only be a colon */
@ -414,7 +418,6 @@ log_age_parse(char *agestr)
if ( gotdays && !agestr[2] ) if ( gotdays && !agestr[2] )
return -1; return -1;
t1 *= 60;
t1 += t2; t1 += t2;
if ( !agestr[2] ) if ( !agestr[2] )
@ -449,7 +452,7 @@ log_age_unparse( int age, struct berval *agebv )
age /= 60; age /= 60;
mm = age % 60; mm = age % 60;
age /= 60; age /= 60;
hh = age % 60; hh = age % 24;
age /= 24; age /= 24;
dd = age; dd = age;