Browse Source

avutil/parseutils: fix some overflows in duration calculations

Also properly return AVERROR(ERANGE) in case of actual overflows.

Signed-off-by: Marton Balint <cus@passwd.hu>
tags/n4.1
Marton Balint 6 years ago
parent
commit
4c777d52b9
1 changed files with 10 additions and 4 deletions
  1. +10
    -4
      libavutil/parseutils.c

+ 10
- 4
libavutil/parseutils.c View File

@@ -661,12 +661,15 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
if (!q) {
char *o;
/* parse timestr as S+ */
dt.tm_sec = strtol(p, &o, 10);
errno = 0;
t = strtoll(p, &o, 10);
if (o == p) /* the parsing didn't succeed */
return AVERROR(EINVAL);
dt.tm_min = 0;
dt.tm_hour = 0;
if (errno == ERANGE)
return AVERROR(ERANGE);
q = o;
} else {
t = dt.tm_hour * 3600 + dt.tm_min * 60 + dt.tm_sec;
}
}

@@ -688,7 +691,6 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
}

if (duration) {
t = dt.tm_hour * 3600 + dt.tm_min * 60 + dt.tm_sec;
if (q[0] == 'm' && q[1] == 's') {
suffix = 1000;
microseconds /= 1000;
@@ -734,7 +736,11 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
if (*q)
return AVERROR(EINVAL);

if (INT64_MAX / suffix < t)
return AVERROR(ERANGE);
t *= suffix;
if (INT64_MAX - microseconds < t)
return AVERROR(ERANGE);
t += microseconds;
*timeval = negative ? -t : t;
return 0;


Loading…
Cancel
Save