[FFmpeg-cvslog] avutil/timestamp: avoid possible FPE when 0 is passed to av_ts_make_time_string2()

Marton Balint git at videolan.org
Sun Jun 30 10:34:04 EEST 2024


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Mon Jun 17 22:30:26 2024 +0200| [0d5e3f5a4034b6c9312b7c621e25aa4303a00b6f] | committer: Marton Balint

avutil/timestamp: avoid possible FPE when 0 is passed to av_ts_make_time_string2()

Signed-off-by: Marton Balint <cus at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d5e3f5a4034b6c9312b7c621e25aa4303a00b6f
---

 libavutil/timestamp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/timestamp.c b/libavutil/timestamp.c
index 2a3e3012a4..6c231a517d 100644
--- a/libavutil/timestamp.c
+++ b/libavutil/timestamp.c
@@ -24,7 +24,7 @@ char *av_ts_make_time_string2(char *buf, int64_t ts, AVRational tb)
         snprintf(buf, AV_TS_MAX_STRING_SIZE, "NOPTS");
     } else {
         double val = av_q2d(tb) * ts;
-        double log = floor(log10(fabs(val)));
+        double log = (fpclassify(val) == FP_ZERO ? -INFINITY : floor(log10(fabs(val))));
         int precision = (isfinite(log) && log < 0) ? -log + 5 : 6;
         int last = snprintf(buf, AV_TS_MAX_STRING_SIZE, "%.*f", precision, val);
         last = FFMIN(last, AV_TS_MAX_STRING_SIZE - 1) - 1;



More information about the ffmpeg-cvslog mailing list