From patchwork Thu Jun 6 21:50:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 13439 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 55EE84496E9 for ; Fri, 7 Jun 2019 00:57:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3434968A71C; Fri, 7 Jun 2019 00:57:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-2.mx.upcmail.net (vie01a-dmta-pe06-2.mx.upcmail.net [84.116.36.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C42668A6F3 for ; Fri, 7 Jun 2019 00:57:36 +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.92) (envelope-from ) id 1hZ0J7-0003J8-3a for ffmpeg-devel@ffmpeg.org; Thu, 06 Jun 2019 23:52:25 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Z0I9hrZTS5D5NZ0I9hu6pw; Thu, 06 Jun 2019 23:51:25 +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=qA0Y1RSzLLI0WYE932IA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 6 Jun 2019 23:50:58 +0200 Message-Id: <20190606215059.6935-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606215059.6935-1-michael@niedermayer.cc> References: <20190606215059.6935-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfLr0eF/0p2tMIwLcHl88VZh4AeXY7BQI8LTHvTHkw3p/a8QOoeXzeCOB7s1+fVDYsPbFwKoifoDDJTi3KzdXNhbUu98s6iXCNktaHUZ4+rQraCZdh4i2 1wmgxa9dL5GbyCnGP93IBzAgdD4MNDpdG2VxkUFQNpG2ymH+z72J3GhS Subject: [FFmpeg-devel] [PATCH 2/3] avformat/vpk: Check offset for validity 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/vpk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/vpk.c b/libavformat/vpk.c index dcc2db329c..255d6030b0 100644 --- a/libavformat/vpk.c +++ b/libavformat/vpk.c @@ -66,6 +66,9 @@ static int vpk_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; vpk->block_count = (st->duration + (samples_per_block - 1)) / samples_per_block; vpk->last_block_size = (st->duration % samples_per_block) * 16 * st->codecpar->channels / 28; + + if (offset < avio_tell(s->pb)) + return AVERROR_INVALIDDATA; avio_skip(s->pb, offset - avio_tell(s->pb)); avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);