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

opt: avoid segfault in av_opt_next() if the class does not have an option list

Browse Source 
CC: libav-stable@libav.org
(cherry picked from commit d02202e08a994c6c80f0256ae756698541b59902)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
This commit is contained in:
Justin Ruggles 2012-11-08 18:35:49 -05:00 committed by Reinhard Tartler
parent 77e6676d3e
commit dfb7a638e6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavutil/opt.c
View File

@ -57,8 +57,10 @@ const AVOption *av_next_option(void *obj, const AVOption *last)
const AVOption *av_opt_next(void *obj, const AVOption *last) const AVOption *av_opt_next(void *obj, const AVOption *last)
{ {
AVClass *class = *(AVClass**)obj; AVClass *class = *(AVClass**)obj;
if (!last && class->option[0].name) return class->option; if (!last && class->option && class->option[0].name)
if (last && last[1].name) return ++last; return class->option;
if (last && last[1].name)
return ++last;
return NULL; return NULL;
} }