generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avfilter/af_channelmap: Move potential dereference after NULL check in get_channel_idx()

Browse Source 
Fixes CID1270822

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-18 13:40:39 +01:00
parent bdb3194217
commit 9f6431c8f6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/af_channelmap.c
View File

@ -88,13 +88,14 @@ static char* split(char *message, char delim) {
static int get_channel_idx(char **map, int *ch, char delim, int max_ch) static int get_channel_idx(char **map, int *ch, char delim, int max_ch)
{ {
char *next = split(*map, delim); char *next;
int len; int len;
int n = 0; int n = 0;
if (!next && delim == '-')
return AVERROR(EINVAL);
if (!*map) if (!*map)
return AVERROR(EINVAL); return AVERROR(EINVAL);
next = split(*map, delim);
if (!next && delim == '-')
return AVERROR(EINVAL);
len = strlen(*map); len = strlen(*map);
sscanf(*map, "%d%n", ch, &n); sscanf(*map, "%d%n", ch, &n);
if (n != len) if (n != len)