diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-07-05 23:10:44 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-07-06 20:19:48 +0200 |
| commit | 0a48a67e57873b938c49ca57b0629e3e33fe37db (patch) | |
| tree | 2e47af7393dd4012b27ddf020545efae7a59ef07 | |
| parent | 72ac64544f9c0529759c0a1dc16d328dd3342b9b (diff) | |
| download | ffmpeg-0a48a67e57873b938c49ca57b0629e3e33fe37db.tar.gz | |
Fix av_open_input_stream with uninitialized context pointer.
Code would allocate a new context but forget to assign it
to the pointer actually passed to avformat_open_input,
potentially causing a crash.
Even if it was initialized it would cause a memleak.
This caused crashes with e.g. mpd, see also
http://bugs.gentoo.org/show_bug.cgi?id=373423
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit 4e59c8ecf1433b85b539c5e89bb68cfe8b839866)
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index b610276844..b8a284a52b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -524,7 +524,7 @@ int av_open_input_stream(AVFormatContext **ic_ptr, opts = convert_format_parameters(ap); if(!ap->prealloced_context) - ic = avformat_alloc_context(); + *ic_ptr = ic = avformat_alloc_context(); else ic = *ic_ptr; if (!ic) { |