Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-03-30 23:12:13 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2017-03-31 00:35:18 +0300
commit477ba8f9391f779b7927305c89b5c24120930925 (patch)
tree5a7f5d0d9f6c7146b4696aa875969b2eb74b3271 /libavfilter/af_aecho.c
parentfe46d92c15ca7bd35324ff667c433a06af8b845c (diff)
avfilter/af_chorus & aecho: Handle NULL return from av_strtok()
Fixes CID1396260 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter/af_aecho.c')
-rw-r--r--libavfilter/af_aecho.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/af_aecho.c b/libavfilter/af_aecho.c
index 82049e9541..cfaea3de43 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;