generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add out of bound stream index checks

Browse Source 
fix issue379

Originally committed as revision 12417 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-03-10 21:23:06 +00:00
parent 1b9cec96e1
commit 074ac3c2d0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/matroskadec.c
View File

@ -2356,7 +2356,7 @@ matroska_read_header (AVFormatContext *s,
MatroskaDemuxIndex *idx = &matroska->index[i]; MatroskaDemuxIndex *idx = &matroska->index[i];
track = matroska_find_track_by_num(matroska, idx->track); track = matroska_find_track_by_num(matroska, idx->track);
stream = matroska->tracks[track]->stream_index; stream = matroska->tracks[track]->stream_index;
if (stream >= 0) if (stream >= 0 && stream < matroska->ctx->nb_streams)
av_add_index_entry(matroska->ctx->streams[stream], av_add_index_entry(matroska->ctx->streams[stream],
idx->pos, idx->time/matroska->time_scale, idx->pos, idx->time/matroska->time_scale,
0, 0, AVINDEX_KEYFRAME); 0, 0, AVINDEX_KEYFRAME);
@ -2400,7 +2400,7 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size,
return res; return res;
} }
stream_index = matroska->tracks[track]->stream_index; stream_index = matroska->tracks[track]->stream_index;
if (stream_index < 0) { if (stream_index < 0 || stream_index >= matroska->ctx->nb_streams) {
av_free(origdata); av_free(origdata);
return res; return res;
} }