Commit 477ba8f9 authored by Michael Niedermayer's avatar Michael Niedermayer

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

Fixes CID1396260
Reviewed-by: 's avatarPaul B Mahol <onemda@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent fe46d92c
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment