OSDN Git Service

avfilter: do not crash on null link src/dst in avfilter_destroy()
authorMåns Rullgård <mans@mansr.com>
Fri, 6 Aug 2010 22:25:36 +0000 (22:25 +0000)
committerMåns Rullgård <mans@mansr.com>
Fri, 6 Aug 2010 22:25:36 +0000 (22:25 +0000)
Originally committed as revision 24719 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavfilter/avfilter.c

index d4ce977..02cdb56 100644 (file)
@@ -429,6 +429,7 @@ void avfilter_destroy(AVFilterContext *filter)
 
     for(i = 0; i < filter->input_count; i ++) {
         if(filter->inputs[i]) {
+            if (filter->inputs[i]->src)
             filter->inputs[i]->src->outputs[filter->inputs[i]->srcpad] = NULL;
             avfilter_formats_unref(&filter->inputs[i]->in_formats);
             avfilter_formats_unref(&filter->inputs[i]->out_formats);
@@ -437,6 +438,7 @@ void avfilter_destroy(AVFilterContext *filter)
     }
     for(i = 0; i < filter->output_count; i ++) {
         if(filter->outputs[i]) {
+            if (filter->outputs[i]->dst)
             filter->outputs[i]->dst->inputs[filter->outputs[i]->dstpad] = NULL;
             avfilter_formats_unref(&filter->outputs[i]->in_formats);
             avfilter_formats_unref(&filter->outputs[i]->out_formats);