From: Justin Ruggles Date: Thu, 8 Nov 2012 23:35:49 +0000 (-0500) Subject: opt: avoid segfault in av_opt_next() if the class does not have an option list X-Git-Tag: n1.1~19^2~70 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=d02202e08a994c6c80f0256ae756698541b59902;hp=5778299c7ed3f82c624589bd35c82f597a8e0b64 opt: avoid segfault in av_opt_next() if the class does not have an option list CC: libav-stable@libav.org --- diff --git a/libavutil/opt.c b/libavutil/opt.c index e199170075..8a98a9ef55 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -37,8 +37,10 @@ const AVOption *av_opt_next(void *obj, const AVOption *last) { AVClass *class = *(AVClass**)obj; - if (!last && class->option[0].name) return class->option; - if (last && last[1].name) return ++last; + if (!last && class->option && class->option[0].name) + return class->option; + if (last && last[1].name) + return ++last; return NULL; }