diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-16 21:14:40 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-16 23:37:24 +0100 |
commit | caa7a3914f499f74b3ee346f26d598ebdc0ec210 (patch) | |
tree | 4088578d8022f0f95a279f533361780cd8e9da0f /libavformat/isom.h | |
parent | 3881606240953b9275a247a1c98a567f3c44890f (diff) | |
download | ffmpeg-caa7a3914f499f74b3ee346f26d598ebdc0ec210.tar.gz |
avformat/mov: check atom nesting depth
Fixes call stack overflow
Fixes: case1_call_stack_overflow.mp4
Found-by: Michal Zalewski <lcamtuf@coredump.cx>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/isom.h')
-rw-r--r-- | libavformat/isom.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/isom.h b/libavformat/isom.h index f8e398b886..b4f0202a77 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -190,6 +190,7 @@ typedef struct MOVContext { int has_looked_for_mfra; MOVFragmentIndex** fragment_index_data; unsigned fragment_index_count; + int atom_depth; } MOVContext; int ff_mp4_read_descr_len(AVIOContext *pb); |