aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-05-02 20:45:14 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-06-27 17:50:47 +0200
commitfd05665f9c9997cc43275be1befe81806a1a79d1 (patch)
tree862740e2984ea3286ea31cabc71ce855e9a18a9f /libavformat
parent7ffd2ae87eaa7cda08bdd14bd593c2911f959994 (diff)
downloadffmpeg-fd05665f9c9997cc43275be1befe81806a1a79d1.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>
Diffstat (limited to 'libavformat')
-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 f60696e3ad..a11036634c 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->url, wc->chunk_index - 1) < 0) {