[FFmpeg-cvslog] avfilter/af_chorus & aecho: Handle NULL return from av_strtok()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Mar 30 22:12:13 2017 +0200| [477ba8f9391f779b7927305c89b5c24120930925] | committer: Michael Niedermayer

avfilter/af_chorus & aecho: Handle NULL return from av_strtok()

Fixes CID1396260

Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavfilter/af_aecho.c  | 3 ++-
 libavfilter/af_chorus.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavfilter/af_aecho.c b/libavfilter/af_aecho.c
index 82049e9..cfaea3d 100644
--- 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;
diff --git a/libavfilter/af_chorus.c b/libavfilter/af_chorus.c
index c596164..87c8290 100644
--- a/libavfilter/af_chorus.c
+++ b/libavfilter/af_chorus.c
@@ -96,7 +96,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;