From d5e1244ca7731820639849924c77e65eeaea5089 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 15 Nov 2011 22:43:21 +0100
Subject: [PATCH] opt: Fix *av_opt_find2(NULL) Fixes Ticket650
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavutil/opt.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 2421ee8bf1d..ca31be3a9ae 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -753,9 +753,14 @@ const AVOption *av_opt_find(void *obj, const char *name, const char *unit,
const AVOption *av_opt_find2(void *obj, const char *name, const char *unit,
int opt_flags, int search_flags, void **target_obj)
{
- const AVClass *c = *(AVClass**)obj;
+ const AVClass *c;
const AVOption *o = NULL;
+ if(!obj)
+ return NULL;
+
+ c= *(AVClass**)obj;
+
if (search_flags & AV_OPT_SEARCH_CHILDREN) {
if (search_flags & AV_OPT_SEARCH_FAKE_OBJ) {
const AVClass *child = NULL;
--
GitLab