Module: libav Branch: release/0.8 Commit: dfb7a638e6b9d4b86b7e3c5cf97bdd7621adc5f6
Author: Justin Ruggles <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Thu Nov 8 18:35:49 2012 -0500 opt: avoid segfault in av_opt_next() if the class does not have an option list CC: [email protected] (cherry picked from commit d02202e08a994c6c80f0256ae756698541b59902) Signed-off-by: Reinhard Tartler <[email protected]> --- libavutil/opt.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 7c53024..aea381e 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -57,8 +57,10 @@ const AVOption *av_next_option(void *obj, const AVOption *last) 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; } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
