On 23.11.2014 00:59, Clément Bœsch wrote:
On Sun, Nov 23, 2014 at 12:58:06AM +0100, Lukasz Marek wrote:
It indirectly also fixes av_opt_free for NULL objs.
Signed-off-by: Lukasz Marek <lukasz.m.lu...@gmail.com>
---
libavutil/opt.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 47b1f0c..85330c9 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -50,6 +50,8 @@ const AVOption *av_next_option(void *obj, const AVOption
*last)
const AVOption *av_opt_next(void *obj, const AVOption *last)
{
+ if (!obj)
+ return NULL;
AVClass *class = *(AVClass**)obj;
AVClass *class must be declared above
Thx for notice, updated patch is attached.
>From 01f6964251ae9805c62794f3dca17be0cd2255c1 Mon Sep 17 00:00:00 2001
From: Lukasz Marek <lukasz.m.lu...@gmail.com>
Date: Sun, 23 Nov 2014 00:48:17 +0100
Subject: [PATCH] lavu/opt: handle NULL obj in av_opt_next
It indirectly also fixes av_opt_free for NULL objs.
Signed-off-by: Lukasz Marek <lukasz.m.lu...@gmail.com>
---
libavutil/opt.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 47b1f0c..c94d0f7 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -50,7 +50,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;
+ const AVClass *class;
+ if (!obj)
+ return NULL;
+ class = *(const AVClass**)obj;
if (!last && class && class->option && class->option[0].name)
return class->option;
if (last && last[1].name)
--
1.9.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
