From d02202e08a994c6c80f0256ae756698541b59902 Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Thu, 8 Nov 2012 18:35:49 -0500
Subject: [PATCH] opt: avoid segfault in av_opt_next() if the class does not
have an option list
CC: libav-stable@libav.org
---
libavutil/opt.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavutil/opt.c b/libavutil/opt.c
index e199170075d..8a98a9ef55b 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;
}
--
GitLab