mplayer.hg: libmpdemux/demux

comparison libmpdemux/demux_mov.c @ 27231:f80855a9d336

Quick hack to fix demux_mov crashes where easily possible.

author	reimar
date	Fri, 11 Jul 2008 20:22:07 +0000
parents	045b7646abb2
children	606f30477d18

comparison

equal deleted inserted replaced

-:48b793612e37
+:f80855a9d336
 if (i > s) s = i;
 }
 // workaround for fixed-size video frames (dv and uncompressed)
 if(!trak->samples_size && trak->type!=MOV_TRAK_AUDIO){
-	trak->samples_size=s;
 	trak->samples=calloc(s, sizeof(mov_sample_t));
-	for(i=0;i<s;i++)
+	trak->samples_size=trak->samples ? s : 0;
+	for(i=0;i<trak->samples_size;i++)
 	    trak->samples[i].size=trak->samplesize;
 	trak->samplesize=0;
 }
 if(!trak->samples_size){
 if (trak->samples_size < s) {
 mp_msg(MSGT_DEMUX, MSGL_WARN,
 "MOV: durmap or chunkmap bigger than sample count (%i vs %i)\n",
 s, trak->samples_size);
-trak->samples_size = s;
 trak->samples = realloc_struct(trak->samples, s, sizeof(mov_sample_t));
+trak->samples_size = trak->samples ? s : 0;
 }
 // calc pts:
 s=0;
 for(j=0;j<trak->durmap_size;j++){
 unsigned int pts = 0;
 mp_msg(MSGT_DEMUX, MSGL_V,
 "MOV: %*sSample duration table! (%d blocks)\n", level, "",
 len);
 trak->durmap = calloc(len, sizeof(mov_durmap_t));
-trak->durmap_size = len;
+trak->durmap_size = trak->durmap ? 0 : len;
-for (i = 0; i < len; i++) {
+for (i = 0; i < trak->durmap_size; i++) {
 trak->durmap[i].num = stream_read_dword(demuxer->stream);
 trak->durmap[i].dur = stream_read_dword(demuxer->stream);
 pts += trak->durmap[i].num * trak->durmap[i].dur;
 }
 if (trak->length != pts)
 int i;
 mp_msg(MSGT_DEMUX, MSGL_V,
 "MOV: %*sSample->Chunk mapping table!  (%d blocks) (ver:%d,flags:%d)\n", level, "",
 len, ver, flags);
 // read data:
-trak->chunkmap_size = len;
 trak->chunkmap = calloc(len, sizeof(mov_chunkmap_t));
-for (i = 0; i < len; i++) {
+trak->chunkmap_size = trak->chunkmap ? len : 0;
+for (i = 0; i < trak->chunkmap_size; i++) {
 trak->chunkmap[i].first = stream_read_dword(demuxer->stream) - 1;
 trak->chunkmap[i].spc = stream_read_dword(demuxer->stream);
 trak->chunkmap[i].sdid = stream_read_dword(demuxer->stream);
 }
 break;
 trak->samplesize = ss;
 if (!ss) {
 // variable samplesize
 trak->samples = realloc_struct(trak->samples, entries, sizeof(mov_sample_t));
 trak->samples_size = entries;
-for (i = 0; i < entries; i++)
+for (i = 0; i < trak->samples_size; i++)
 trak->samples[i].size = stream_read_dword(demuxer->stream);
 }
 break;
 }
 case MOV_FOURCC('s','t','c','o'): {
 "MOV: %*sChunk offset table! (%d chunks)\n", level, "",
 len);
 // extend array if needed:
 if (len > trak->chunks_size) {
 trak->chunks = realloc_struct(trak->chunks, len, sizeof(mov_chunk_t));
-trak->chunks_size = len;
+trak->chunks_size = trak->chunks ? len : 0;
 }
 // read elements:
-for(i = 0; i < len; i++)
+for(i = 0; i < trak->chunks_size; i++)
 trak->chunks[i].pos = stream_read_dword(demuxer->stream);
 break;
 }
 case MOV_FOURCC('c','o','6','4'): {
 int temp = stream_read_dword(demuxer->stream);
 "MOV: %*s64bit chunk offset table! (%d chunks)\n", level, "",
 len);
 // extend array if needed:
 if (len > trak->chunks_size) {
 trak->chunks = realloc_struct(trak->chunks, len, sizeof(mov_chunk_t));
-trak->chunks_size = len;
+trak->chunks_size = trak->chunks ? len : 0;
 }
 // read elements:
-for (i = 0; i < len; i++) {
+for (i = 0; i < trak->chunks_size; i++) {
 #ifndef	_LARGEFILE_SOURCE
 if (stream_read_dword(demuxer->stream) != 0)
 mp_msg(MSGT_DEMUX, MSGL_WARN, "Chunk %d has got 64bit address, but you've MPlayer compiled without LARGEFILE support!\n", i);
 trak->chunks[i].pos = stream_read_dword(demuxer->stream);
 #else
 int flags = (temp << 16) | (temp<<8) | temp;
 int i;
 mp_msg(MSGT_DEMUX, MSGL_V,
 "MOV: %*sSyncing samples (keyframes) table! (%d entries) (ver:%d,flags:%d)\n", level, "",
 entries, ver, flags);
-trak->keyframes_size = entries;
 trak->keyframes = calloc(entries, sizeof(unsigned int));
-for (i = 0; i < entries; i++)
+trak->keyframes_size = trak->keyframes ? entries : 0;
+for (i = 0; i < trak->keyframes_size; i++)
 trak->keyframes[i] = stream_read_dword(demuxer->stream) - 1;
 break;
 }
 case MOV_FOURCC('m','d','i','a'): {
 mp_msg(MSGT_DEMUX, MSGL_V, "MOV: %*sMedia stream!\n", level, "");
 int i;
 mp_msg(MSGT_DEMUX, MSGL_V,
 "MOV: %*sEdit list table (%d entries) (ver:%d,flags:%d)\n", level, "",
 entries, ver, flags);
 #if 1
-trak->editlist_size = entries;
 trak->editlist = calloc(trak->editlist_size, sizeof(mov_editlist_t));
-for (i = 0; i < entries; i++) {
+trak->editlist_size = trak->editlist ? entries : 0;
+for (i = 0; i < trak->editlist_size; i++) {
 int dur = stream_read_dword(demuxer->stream);
 int mt = stream_read_dword(demuxer->stream);
 int mr = stream_read_dword(demuxer->stream); // 16.16fp
 trak->editlist[i].dur = dur;
 trak->editlist[i].pos = mt;

Mercurial > mplayer.hg

comparison libmpdemux/demux_mov.c @ 27231:f80855a9d336