[FFmpeg-cvslog] avformat/vivo: Do not use the general expression evaluator for parsing a floating point value
Michael Niedermayer
git at videolan.org
Fri Apr 8 01:31:09 EEST 2022
ffmpeg | branch: release/4.2 | Michael Niedermayer <michael at niedermayer.cc> | Sun Dec 5 18:40:03 2021 +0100| [6cbacf1818ef11996845e644cbf69dbfe02be097] | committer: Michael Niedermayer
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 <michael at niedermayer.cc>
(cherry picked from commit 7b24615565fd488e7e3a435102979a5ea85fe2fe)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6cbacf1818ef11996845e644cbf69dbfe02be097
---
libavformat/vivo.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/libavformat/vivo.c b/libavformat/vivo.c
index 9a07c43849..09b593feb4 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"
@@ -204,11 +205,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)
More information about the ffmpeg-cvslog
mailing list