summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2017-11-27 16:32:54 +0100
committerCarl Eugen Hoyos <ceffmpeg@gmail.com>2019-01-25 00:57:38 +0100
commit7653e8db4deb063ffbbfb9c14ed60f9bb56acff0 (patch)
tree972a99e129c7556171dc88cea339200e8384d317
parenta9c1ef2626363fbc0987cc34e615e07052b9ba5a (diff)
downloadffmpeg-7653e8db4deb063ffbbfb9c14ed60f9bb56acff0.tar.gz
avfilter/af_silenceremove: fix possible crash if supplied duration is negative
Signed-off-by: Paul B Mahol <onemda@gmail.com> Fixes ticket #7697. (cherry picked from commit 2d1594a8d6a754a426cb53184dccf9cf8c8a94b0)
-rw-r--r--libavfilter/af_silenceremove.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/libavfilter/af_silenceremove.c b/libavfilter/af_silenceremove.c
index f156d1883d..3d3651a76f 100644
--- a/libavfilter/af_silenceremove.c
+++ b/libavfilter/af_silenceremove.c
@@ -186,8 +186,17 @@ static int config_input(AVFilterLink *inlink)
s->start_duration = av_rescale(s->start_duration, inlink->sample_rate,
AV_TIME_BASE);
+ if (s->start_duration < 0) {
+ av_log(ctx, AV_LOG_WARNING, "start duration must be non-negative\n");
+ s->start_duration = -s->start_duration;
+ }
+
s->stop_duration = av_rescale(s->stop_duration, inlink->sample_rate,
AV_TIME_BASE);
+ if (s->stop_duration < 0) {
+ av_log(ctx, AV_LOG_WARNING, "stop duration must be non-negative\n");
+ s->stop_duration = -s->stop_duration;
+ }
s->start_holdoff = av_malloc_array(FFMAX(s->start_duration, 1),
sizeof(*s->start_holdoff) *