From dbaba52ed25f79c8be0ce1a478b229bf868f8c11 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 6 Jun 2011 13:14:05 +0200 Subject: [PATCH] lavf: don't try to free private options if priv_data is NULL. This might happen if there was an error before priv_data was allocated and result in segfault. --- libavformat/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 8ab59e1d3..c198af07e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2551,7 +2551,7 @@ void avformat_free_context(AVFormatContext *s) AVStream *st; av_opt_free(s); - if (s->iformat && s->iformat->priv_class) + if (s->iformat && s->iformat->priv_class && s->priv_data) av_opt_free(s->priv_data); for(i=0;inb_streams;i++) { -- 2.11.0