Merge commit '81a3c42abe17e757fe890607f67201a240648993'

[ffmpeg] / libavfilter / af_aecho.c

diff --git a/libavfilter/af_aecho.c b/libavfilter/af_aecho.c
index 82049e95411b983bb8dfb095f5db979b4b1b8413..cfaea3de43057fc2d37748f9e9e26813ce012de7 100644 (file)
--- a/libavfilter/af_aecho.c
+++ b/libavfilter/af_aecho.c
@@ -77,7 +77,8 @@ static void fill_items(char *item_str, int *nb_items, float *items)
     for (i = 0; i < *nb_items; i++) {
         char *tstr = av_strtok(p, "|", &saveptr);
         p = NULL;
-        new_nb_items += sscanf(tstr, "%f", &items[i]) == 1;
+        if (tstr)
+            new_nb_items += sscanf(tstr, "%f", &items[new_nb_items]) == 1;
     }
 
     *nb_items = new_nb_items;