RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-03 21:42:09 +00:00
Code Issues Projects Releases Wiki Activity

avformat/flvdec: Check data before casting

Browse Source 
Fixes: -nan is outside the range of representable values of type 'long'
Fixes: signed integer overflow: 1000 * -9223372036854775808 cannot be represented in type 'long'
Fixes: 34890/clusterfuzz-testcase-minimized-ffmpeg_dem_FLV_fuzzer-5334208657620992

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2021-06-08 18:09:55 +02:00
parent 5509235818
commit 1e24da5cfe
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/flvdec.c
View File

@ -682,7 +682,11 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream,
av_dict_set(&s->metadata, key, str_val, 0);
} else if (amf_type == AMF_DATA_TYPE_STRING) {
av_dict_set(&s->metadata, key, str_val, 0);
} else if (amf_type == AMF_DATA_TYPE_DATE) {
} else if ( amf_type == AMF_DATA_TYPE_DATE
&& isfinite(date.milliseconds)
&& date.milliseconds > INT64_MIN/1000
&& date.milliseconds < INT64_MAX/1000
) {
// timezone is ignored, since there is no easy way to offset the UTC
// timestamp into the specified timezone
avpriv_dict_set_timestamp(&s->metadata, key, 1000 * (int64_t)date.milliseconds);