RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Prevent infinite recursion of odml indexes. 

This fixes a stack overflow.

Originally committed as revision 23925 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-07-01 00:09:08 +00:00
parent 4148855ee4
commit 0c0fd063dd
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/avidec.c
View File

@ -61,6 +61,8 @@ typedef struct {
int non_interleaved; int non_interleaved;
int stream_index; int stream_index;
DVDemuxContext* dv_demux; DVDemuxContext* dv_demux;
int odml_depth;
#define MAX_ODML_DEPTH 1000
} AVIContext; } AVIContext;
static const char avi_headers[][8] = { static const char avi_headers[][8] = {
@ -190,8 +192,15 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num){
pos = url_ftell(pb); pos = url_ftell(pb);
if(avi->odml_depth > MAX_ODML_DEPTH){
av_log(s, AV_LOG_ERROR, "Too deeply nested ODML indexes\n");
return -1;
}
url_fseek(pb, offset+8, SEEK_SET); url_fseek(pb, offset+8, SEEK_SET);
avi->odml_depth++;
read_braindead_odml_indx(s, frame_num); read_braindead_odml_indx(s, frame_num);
avi->odml_depth--;
frame_num += duration; frame_num += duration;
url_fseek(pb, pos, SEEK_SET); url_fseek(pb, pos, SEEK_SET);