diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-14 21:24:54 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 03:34:23 +0200 |
commit | e0975c31f1888d2b1b8ff21ec8c6c56fe1da9cdb (patch) | |
tree | bfb8aaa6145fde06d9c61bbd9a4675b3f0f0c67f | |
parent | e168db3eaef0ee19af3bc5ce748b8d423e1d6135 (diff) | |
download | ffmpeg-e0975c31f1888d2b1b8ff21ec8c6c56fe1da9cdb.tar.gz |
avformat/mov: Check for string truncation in mov_open_dref()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8003816e1619e77d8de051883264aa090e0d78cc)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index ab09665002..7746cc197c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2366,7 +2366,7 @@ static int mov_open_dref(AVIOContext **pb, const char *src, MOVDref *ref, /* try relative path, we do not try the absolute because it can leak information about our system to an attacker */ if (ref->nlvl_to > 0 && ref->nlvl_from > 0) { - char filename[1024]; + char filename[1025]; const char *src_path; int i, l; @@ -2396,6 +2396,8 @@ static int mov_open_dref(AVIOContext **pb, const char *src, MOVDref *ref, av_strlcat(filename, ref->path + l + 1, sizeof(filename)); + if (strlen(filename) + 1 == sizeof(filename)) + return AVERROR(ENOENT); if (!avio_open2(pb, filename, AVIO_FLAG_READ, int_cb, NULL)) return 0; } |