[FFmpeg-cvslog] Avoid crash due to ic being NULL if avformat_open_input fails.

Reimar Döffinger git at videolan.org
Tue Aug 23 23:58:28 CEST 2011


ffmpeg | branch: release/0.7 | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Tue Aug 23 19:39:16 2011 +0200| [95345e942cd5b8be6722d48e3f17782e97d09bde] | committer: Reimar Döffinger

Avoid crash due to ic being NULL if avformat_open_input fails.

This updates the code to match current master.
Should fix trac issue #410.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>

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

 libavformat/utils.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 3242887..662b49a 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -537,7 +537,8 @@ int av_open_input_stream(AVFormatContext **ic_ptr,
     else
         ic->pb = pb;
 
-    err = avformat_open_input(&ic, filename, fmt, &opts);
+    if ((err = avformat_open_input(&ic, filename, fmt, &opts)) < 0)
+        goto fail;
 
     *ic_ptr = ic;
     ic->pb = ic->pb ? ic->pb : pb; // don't leak custom pb if it wasn't set above



More information about the ffmpeg-cvslog mailing list