diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-16 21:14:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-22 03:17:55 +0100 |
| commit | d85e25fe0b52fd37cbcc9cffb440219fbdd9bb3d (patch) | |
| tree | 3b338341d53b747e01bc50f0fe35623d24ea863c /libavformat/isom.h | |
| parent | 3d1972d182c009472a5172c9d9272c3454301a44 (diff) | |
| download | ffmpeg-d85e25fe0b52fd37cbcc9cffb440219fbdd9bb3d.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>
(cherry picked from commit caa7a3914f499f74b3ee346f26d598ebdc0ec210)
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 e3160d00f8..249c3ab795 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -189,6 +189,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); |