[FFmpeg-devel] [PATCH 1/2] lavu/opt: handle NULL obj in av_opt_next

[Michael Niedermayer]

On Sun, Nov 23, 2014 at 01:10:21AM +0100, Lukasz Marek wrote:
> 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.luki2 at 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.
> 

>  opt.c |    5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 39406482021ccfc2ee83515a3cf9ea809583f711  0001-lavu-opt-handle-NULL-obj-in-av_opt_next.patch
> From 01f6964251ae9805c62794f3dca17be0cd2255c1 Mon Sep 17 00:00:00 2001
> From: Lukasz Marek <lukasz.m.luki2 at 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.

LGTM

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

When you are offended at any man's fault, turn to yourself and study your
own failings. Then you will forget your anger. -- Epictetus
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20141124/0a32088b/attachment.asc>