RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-18 04:51:52 +00:00
Code Issues Releases Wiki Activity

extra size checks for samples array to avoid crashes in some rare cases.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16321 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2005-08-30 23:24:47 +00:00
parent 24096d2755
commit c1f2df8f53
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libmpdemux/demux_mov.c
View File

@ -194,6 +194,14 @@ void mov_build_index(mov_track_t* trak,int timescale){
trak->chunks[j].sample=s;
s+=trak->chunks[j].size;
}
i = 0;
for (j = 0; j < trak->durmap_size; j++)
i += trak->durmap[j].num;
if (i != s) {
mp_msg(MSGT_DEMUX, MSGL_WARN,
"MOV: durmap and chunkmap sample count differ (%i vs %i)\n", i, s);
if (i > s) s = i;
}
// workaround for fixed-size video frames (dv and uncompressed)
if(!trak->samples_size && trak->type!=MOV_TRAK_AUDIO){
@ -212,6 +220,14 @@ void mov_build_index(mov_track_t* trak,int timescale){
return;
}
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(trak->samples, sizeof(mov_sample_t) * s);
}
// calc pts:
s=0;
for(j=0;j<trak->durmap_size;j++){