aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-05-02 20:45:14 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-07-01 12:11:55 +0200
commitd62af7c5428bf0fe5bb963bbe14f27dd22cc0265 (patch)
tree85a70b1f8c6492b0771578d213608bdd63c6f56d
parent58f6d9143c55f0ec82744cbc6d9cbc5a522c941e (diff)
downloadffmpeg-d62af7c5428bf0fe5bb963bbe14f27dd22cc0265.tar.gz
avformat/webm_chunk: Check header filename length
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 3b5b977c9f96e2c3803317ad75253801bc571791) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/webm_chunk.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c
index 3f91162da7..dd49afdb9e 100644
--- a/libavformat/webm_chunk.c
+++ b/libavformat/webm_chunk.c
@@ -92,11 +92,16 @@ static int get_chunk_filename(AVFormatContext *s, int is_header, char *filename)
return AVERROR(EINVAL);
}
if (is_header) {
+ int len;
if (!wc->header_filename) {
av_log(oc, AV_LOG_ERROR, "No header filename provided\n");
return AVERROR(EINVAL);
}
- av_strlcpy(filename, wc->header_filename, MAX_FILENAME_SIZE);
+ len = av_strlcpy(filename, wc->header_filename, MAX_FILENAME_SIZE);
+ if (len >= MAX_FILENAME_SIZE) {
+ av_log(oc, AV_LOG_ERROR, "Header filename too long\n");
+ return AVERROR(EINVAL);
+ }
} else {
if (av_get_frame_filename(filename, MAX_FILENAME_SIZE,
s->filename, wc->chunk_index - 1) < 0) {