[FFmpeg-cvslog] graphparser: add missing NULL check in avfilter_graph_parse()

Stefano Sabatini git at videolan.org
Sat Jun 18 02:16:02 CEST 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Sat Jun 18 02:02:31 2011 +0200| [8055433b492fe971a145a07470119ef8c2c71571] | committer: Stefano Sabatini

graphparser: add missing NULL check in avfilter_graph_parse()

Fix a crash occurring when open_inputs is NULL and *open_inputs is
checked, the crash was introduced by the recent avfilter_graph_parse()
syntax change.

In particular, fix graph2dot crash.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8055433b492fe971a145a07470119ef8c2c71571
---

 libavfilter/graphparser.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index d62ba8d..5178eea 100644
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -387,7 +387,7 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
         goto fail;
     }
 
-    if (*open_inputs && !strcmp((*open_inputs)->name, "out") && curr_inputs) {
+    if (open_inputs && *open_inputs && !strcmp((*open_inputs)->name, "out") && curr_inputs) {
         /* Last output can be omitted if it is "[out]" */
         const char *tmp = "[out]";
         if ((ret = parse_outputs(&tmp, &curr_inputs, open_inputs, open_outputs,



More information about the ffmpeg-cvslog mailing list