diff options
| author | Michael Niedermayer <[email protected]> | 2021-12-05 18:40:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2022-04-06 20:38:05 +0200 |
| commit | deba3d03723de72c386bdcc2db5ac733bd05adc7 (patch) | |
| tree | cb5e4a1cf8f86f37937586c09bba851f39cdf137 | |
| parent | d80dbe65054cc70c8573a3d62c4492ef5d3962a2 (diff) | |
avformat/vivo: Do not use the general expression evaluator for parsing a floating point value
Fixes: Timeout
Fixes: 41564/clusterfuzz-testcase-minimized-ffmpeg_dem_VIVO_fuzzer-6309014024093696
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 7b24615565fd488e7e3a435102979a5ea85fe2fe)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavformat/vivo.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/vivo.c b/libavformat/vivo.c index fb58aa6178..12bdc05d9e 100644 --- a/libavformat/vivo.c +++ b/libavformat/vivo.c @@ -26,6 +26,7 @@ * @sa http://wiki.multimedia.cx/index.php?title=Vivo */ +#include "libavutil/avstring.h" #include "libavutil/parseutils.h" #include "avformat.h" #include "internal.h" @@ -206,11 +207,12 @@ static int vivo_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; value_used = 1; } else if (!strcmp(key, "FPS")) { - AVRational tmp; + double d; + if (av_sscanf(value, "%f", &d) != 1) + return AVERROR_INVALIDDATA; value_used = 1; - if (!av_parse_ratio(&tmp, value, 10000, AV_LOG_WARNING, s)) - fps = av_inv_q(tmp); + fps = av_inv_q(av_d2q(d, 10000)); } if (!value_used) |