diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-06-08 18:09:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-06-12 14:22:42 +0200 |
| commit | 1e24da5cfe1cec70e322b93578227465f325936e (patch) | |
| tree | 53d79a68d215ad9247c2c845f325531cb6d4f3dd /libavformat | |
| parent | 55092358189b98682d133c7b05bfcbb7ab6c750f (diff) | |
| download | ffmpeg-1e24da5cfe1cec70e322b93578227465f325936e.tar.gz | |
avformat/flvdec: Check data before casting
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>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/flvdec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 6bd6c8c944..60d1a5c654 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -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); |