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:57:22 +0100 |
commit | 3aa99bed5df3f5da0e3b4d871eb197b028cf1f4d (patch) | |
tree | 1c9cfbdcfdd53537b1cd910e67ce3ed86d222c96 /libavformat/isom.h | |
parent | ece0c9c4b04257d8ba3689987251f44421b1ead7 (diff) | |
download | ffmpeg-3aa99bed5df3f5da0e3b4d871eb197b028cf1f4d.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)
Conflicts:
libavformat/isom.h
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 4154baf827..c9004771bb 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -162,6 +162,7 @@ typedef struct MOVContext { int use_absolute_path; int ignore_editlist; int64_t next_root_atom; ///< offset of the next root atom + int atom_depth; } MOVContext; int ff_mp4_read_descr_len(AVIOContext *pb); |