]> git.sesse.net Git - ffmpeg/commitdiff
avfilter/af_adelay: make per channel delay argument an int64_t
authorJames Almer <jamrial@gmail.com>
Fri, 23 Apr 2021 03:26:09 +0000 (00:26 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 25 Apr 2021 12:22:09 +0000 (09:22 -0300)
Should fix ticket #9196

Signed-off-by: James Almer <jamrial@gmail.com>
libavfilter/af_adelay.c

index 6ac81c2a3e04cf77b8fd8af577f5b3cccf8a8d14..81ff7947f553457b1e9584124ebd94f04fe07a48 100644 (file)
@@ -28,9 +28,9 @@
 #include "internal.h"
 
 typedef struct ChanDelay {
-    int delay;
-    unsigned delay_index;
-    unsigned index;
+    int64_t delay;
+    size_t delay_index;
+    size_t index;
     uint8_t *samples;
 } ChanDelay;
 
@@ -152,7 +152,7 @@ static int config_input(AVFilterLink *inlink)
 
         p = NULL;
 
-        ret = av_sscanf(arg, "%d%c", &d->delay, &type);
+        ret = av_sscanf(arg, "%"SCNd64"%c", &d->delay, &type);
         if (ret != 2 || type != 'S') {
             div = type == 's' ? 1.0 : 1000.0;
             if (av_sscanf(arg, "%f", &delay) != 1) {
@@ -194,6 +194,11 @@ static int config_input(AVFilterLink *inlink)
         if (!d->delay)
             continue;
 
+        if (d->delay > SIZE_MAX) {
+            av_log(ctx, AV_LOG_ERROR, "Requested delay is too big.\n");
+            return AVERROR(EINVAL);
+        }
+
         d->samples = av_malloc_array(d->delay, s->block_align);
         if (!d->samples)
             return AVERROR(ENOMEM);