From patchwork Wed Mar 8 22:28:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 2844 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp65994vsy; Wed, 8 Mar 2017 14:29:31 -0800 (PST) X-Received: by 10.223.136.4 with SMTP id d4mr7609795wrd.44.1489012171123; Wed, 08 Mar 2017 14:29:31 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z20si1753163wmc.68.2017.03.08.14.29.30; Wed, 08 Mar 2017 14:29:31 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C690688346; Thu, 9 Mar 2017 00:28:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe02-2.mx.upcmail.net (vie01a-qmta-pe02-2.mx.upcmail.net [62.179.121.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72F3F68830F for ; Thu, 9 Mar 2017 00:28:47 +0200 (EET) Received: from [172.31.218.33] (helo=vie01a-dmta-pe01-3.mx.upcmail.net) by vie01a-pqmta-pe02.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1clk4q-0006Xt-UZ for ffmpeg-devel@ffmpeg.org; Wed, 08 Mar 2017 23:29:00 +0100 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1clk4l-00084v-Em for ffmpeg-devel@ffmpeg.org; Wed, 08 Mar 2017 23:28:55 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id taUp1u00J0S5wYM01aUqQN; Wed, 08 Mar 2017 23:28:50 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 8 Mar 2017 23:28:43 +0100 Message-Id: <20170308222843.9289-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170308222843.9289-1-michael@niedermayer.cc> References: <20170308222843.9289-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/movtextdec: run mov_text_cleanup() before overwriting pointers 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: memleak Fixes: 741/clusterfuzz-testcase-586996200452915 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/movtextdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 6de15004fc..fb5085c3e8 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -459,6 +459,8 @@ static int mov_text_decode_frame(AVCodecContext *avctx, end = ptr + FFMIN(2 + text_length, avpkt->size); ptr += 2; + mov_text_cleanup(m); + tsmb_size = 0; m->tracksize = 2 + text_length; m->style_entries = 0;