From patchwork Thu May 2 18:49:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 12970 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id B921344903E for ; Thu, 2 May 2019 21:52:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9FBE268ABDB; Thu, 2 May 2019 21:52:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-1.mx.upcmail.net (vie01a-dmta-pe06-1.mx.upcmail.net [84.116.36.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DEFDB68ABD9 for ; Thu, 2 May 2019 21:52:32 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.91) (envelope-from ) id 1hMGoq-00061t-5N for ffmpeg-devel@ffmpeg.org; Thu, 02 May 2019 20:52:32 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id MGnshUmrn5D5NMGnshQaQj; Thu, 02 May 2019 20:51:32 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=bu8y+3Si c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=fm2o_Uvbec4OqFsK2XgA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 2 May 2019 20:49:36 +0200 Message-Id: <20190502184936.8818-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190502184936.8818-1-michael@niedermayer.cc> References: <20190502184936.8818-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfB3L2fvwFjEPRfl5z3o9kkPjxq8Z97g5gCyTaJDJms+FzbqZ0SfNjzhIE2R2CBsmL2i20cIjvH3a55NAJzEbF0yfVd05KrowHo+X0J9pOX5WkDLbrbb3 9Cn0VWCxqnvyZDquXlUP1uA3yJZ+r6loNft7H5tRTTooSFOE3QLpZSN9 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/webm_chunk: Check header filename length X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- libavformat/webm_chunk.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c index 561ec152e7..e2fbd8be1d 100644 --- a/libavformat/webm_chunk.c +++ b/libavformat/webm_chunk.c @@ -88,6 +88,8 @@ static int get_chunk_filename(AVFormatContext *s, int is_header, char filename[M { WebMChunkContext *wc = s->priv_data; AVFormatContext *oc = wc->avf; + int len; + if (!filename) { return AVERROR(EINVAL); } @@ -96,7 +98,11 @@ static int get_chunk_filename(AVFormatContext *s, int is_header, char filename[M 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) {