summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2019-05-02 20:45:14 +0200
committerMichael Niedermayer <[email protected]>2019-11-14 23:30:37 +0100
commitabb7d3f1d00aad2f2c7923b59f847064f7017e06 (patch)
tree9b07282c27ebd2729f97093c7a3456f5f0be01f9
parent0ecde06ee746ca3b785cd200e0af0485b03cf922 (diff)
avformat/webm_chunk: Check header filename length
Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 3b5b977c9f96e2c3803317ad75253801bc571791) Signed-off-by: Michael Niedermayer <[email protected]>
-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) {