GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-26 04:59:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Try to handle oversized asf headers by ignoring anything beyond the first MB

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20894 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar
2006-11-13 19:16:39 +00:00
parent fec63334f8
commit 59e83201dd
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libmpdemux/asfheader.c
+6 -2
View File
@@ -231,6 +231,7 @@ static int asf_init_audio_stream(demuxer_t *demuxer,struct asf_priv* asf, sh_aud
int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf){
int hdr_len = asf->header.objh.size - sizeof(asf->header);
int hdr_skip = 0;
char *hdr = NULL;
char guid_buffer[16];
int pos, start = stream_tell(demuxer->stream);
@@ -251,9 +252,10 @@ int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf){
}
if (hdr_len > 1024 * 1024) {
mp_msg(MSGT_HEADER, MSGL_FATAL, MSGTR_MPDEMUX_ASFHDR_HeaderSizeOver1MB,
mp_msg(MSGT_HEADER, MSGL_ERR, MSGTR_MPDEMUX_ASFHDR_HeaderSizeOver1MB,
hdr_len);
return 0;
hdr_skip = hdr_len - 1024 * 1024;
hdr_len = 1024 * 1024;
}
hdr = malloc(hdr_len);
if (!hdr) {
@@ -262,6 +264,8 @@ int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf){
return 0;
}
stream_read(demuxer->stream, hdr, hdr_len);
if (hdr_skip)
stream_skip(demuxer->stream, hdr_skip);
if (stream_eof(demuxer->stream)) {
mp_msg(MSGT_HEADER, MSGL_FATAL, MSGTR_MPDEMUX_ASFHDR_EOFWhileReadingHeader);
goto err_out;