[FFmpeg-cvslog] avfilter/af_astats: fix possible crash because of undefined float to integer rounding

Marton Balint git at videolan.org
Sat Jan 23 21:07:45 EET 2021


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Mon Jan 11 00:12:39 2021 +0100| [c8e1e56509c3f176803cdf40b4019263125fa43f] | committer: Marton Balint

avfilter/af_astats: fix possible crash because of undefined float to integer rounding

Fixes ticket #9049.

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

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

 libavfilter/af_astats.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/af_astats.c b/libavfilter/af_astats.c
index ebaae29f44..f50cbe199c 100644
--- a/libavfilter/af_astats.c
+++ b/libavfilter/af_astats.c
@@ -329,11 +329,11 @@ static inline void update_stat(AudioStatsContext *s, ChannelStats *p, double d,
 
     drop = p->win_samples[p->win_pos];
     p->win_samples[p->win_pos] = nd;
-    index = av_clip(FFABS(av_clipd(nd, -1.0, 1.0)) * HISTOGRAM_MAX, 0, HISTOGRAM_MAX);
+    index = av_clip(lrint(av_clipd(FFABS(nd), 0.0, 1.0) * HISTOGRAM_MAX), 0, HISTOGRAM_MAX);
     p->max_index = FFMAX(p->max_index, index);
     p->histogram[index]++;
     if (!isnan(p->noise_floor))
-        p->histogram[av_clip(FFABS(drop) * HISTOGRAM_MAX, 0, HISTOGRAM_MAX)]--;
+        p->histogram[av_clip(lrint(av_clipd(FFABS(drop), 0.0, 1.0) * HISTOGRAM_MAX), 0, HISTOGRAM_MAX)]--;
     p->win_pos++;
 
     while (p->histogram[p->max_index] == 0)



More information about the ffmpeg-cvslog mailing list