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
This commit is contained in:
Justin Ruggles
2012-11-08 18:35:49 -05:00
parent 5778299c7e
commit d02202e08a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavutil/opt.c
View File

@@ -37,8 +37,10 @@
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;
} }