summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_asf.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-12 09:58:27 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-12 09:58:27 +0000
commit955fbdff3f0b1ce44c2b6a4bf726b9ba4e0c62e9 (patch)
treea92c42655a4280f9c914357f19f7b8a2038c0e54 /libmpdemux/demux_asf.c
parent7bb8f38da891da9ae91e8714719235fff6d18edd (diff)
downloadmpv-955fbdff3f0b1ce44c2b6a4bf726b9ba4e0c62e9.tar.bz2
mpv-955fbdff3f0b1ce44c2b6a4bf726b9ba4e0c62e9.tar.xz
we cannot continue without a crash when read_asf_header fails, since some
memory is allocated in that function (ugly!!). Fixes bug #450, patch by Mikulas Patocka (mikulas at artax karlin mff cuni cz) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17599 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_asf.c')
-rw-r--r--libmpdemux/demux_asf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c
index a072b1c640..4a177b70a3 100644
--- a/libmpdemux/demux_asf.c
+++ b/libmpdemux/demux_asf.c
@@ -446,7 +446,8 @@ static demuxer_t* demux_open_asf(demuxer_t* demuxer)
sh_video_t *sh_video=NULL;
//---- ASF header:
- read_asf_header(demuxer);
+ if (!read_asf_header(demuxer))
+ return NULL;
stream_reset(demuxer->stream);
stream_seek(demuxer->stream,demuxer->movi_start);
// demuxer->idx_pos=0;