From patchwork Tue Apr 10 00:28:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8367 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp454974jad; Mon, 9 Apr 2018 17:29:24 -0700 (PDT) X-Google-Smtp-Source: AIpwx48ZkMjdKq6r+PMQ9tStMl1VLmuTfNAHX9TwXubT4zlAopaeb9Ob8Zp/47OUy1MITWYizyqv X-Received: by 10.28.15.78 with SMTP id 75mr24147wmp.16.1523320164627; Mon, 09 Apr 2018 17:29:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523320164; cv=none; d=google.com; s=arc-20160816; b=OF10D01Ll/B498JLP7Mv63TNbG3CJ19Fpi2Wg2fqVKOgXPWosFtSkMdX8fUHrHYr74 a5RKFNJ0obMunBEqvoNr9mnhgWaNM6x6wlwovXLLtuQRYeeWBxAp4/xO32TRGyG9cF1g yUZSiwq/iz9wwdIOpVpU0uxbfsSyPrx7m9LL+FmM6N/o2GZHFpnNRUaNmslvV9B60fJ8 E48N1H4x2KicSoMPU7mo6jgURpKZDi9mSdppqE2x0boAn3YXdLKW4qLACSg6o+RqMEBL SOyPExah9XGri2n6a10AMnEOs9JNR0/17ZK6Ykss5vMJuDByorggyJVML5QiKvTRKigR TMhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=ZpNsuEfwqlWAU2/4M7V4BFJrcsh8NDrUqkgVleFjLpA=; b=GwmbCfsyJT4s89lOxLO9RNXOzkNiwh+6JwAIxgOMXFoBHJ3C/RMfo1Rr+ak+OdwDBj lNs6xGqEB3+bbLI+ycIrI1q5dy/avycqYr3NILVf7R5/AM0uQNcjnyLkXm6viSrqGusl HohCOK/KiXFaI7GGKYaue4xJe4PemBulkHZiKQTu7vXLCG/HNiRO2m08VSb666kX0OI4 pr+myox0oBCy5BNfwKmQthIPFka2sN5TjE3LCL3IGIYnZgRmrYc0tSH6oZxb7ns0K9Gy 81zwCKdJ1jeb9KheaLI2q/m/pdu9owlR6KoikS51dFmm0XKQWf2ioFvgP90r7t+jwh29 +1jQ== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e6si1036308wrj.7.2018.04.09.17.29.24; Mon, 09 Apr 2018 17:29:24 -0700 (PDT) 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 604AE689F9E; Tue, 10 Apr 2018 03:28:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe02-3.mx.upcmail.net (vie01a-qmta-pe02-3.mx.upcmail.net [62.179.121.183]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 965C7689CC4 for ; Tue, 10 Apr 2018 03:28:50 +0300 (EEST) Received: from [172.31.218.38] (helo=vie01a-dmta-pe03-2.mx.upcmail.net) by vie01a-pqmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1f5h9t-0005zy-NB for ffmpeg-devel@ffmpeg.org; Tue, 10 Apr 2018 02:29:13 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1f5h9n-0007R8-Qr for ffmpeg-devel@ffmpeg.org; Tue, 10 Apr 2018 02:29:07 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id YQV51x00i0S5wYM01QV6QT; Tue, 10 Apr 2018 02:29:06 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 10 Apr 2018 02:28:19 +0200 Message-Id: <20180410002820.15374-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mov: Fix extradata memleak 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: crbug 822705 Reported-by: Matt Wolenetz Reviewed-by: Matt Wolenetz Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 97b1462aab..1340bf3913 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2592,6 +2592,12 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom) return mov_finalize_stsd_codec(c, pb, st, sc); fail: + if (sc->extradata) { + int j; + for (j = 0; j < sc->stsd_count; j++) + av_freep(&sc->extradata[j]); + } + av_freep(&sc->extradata); av_freep(&sc->extradata_size); return ret;