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

CC: libav-stable@libav.org
pull/8/head
Justin Ruggles 12 years ago
parent 5778299c7e
commit d02202e08a
  1. 6
      libavutil/opt.c

@ -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;
} }

Loading…
Cancel
Save