From patchwork Fri Nov 17 22:54:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dale Curtis X-Patchwork-Id: 6148 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1192873jah; Fri, 17 Nov 2017 14:55:10 -0800 (PST) X-Google-Smtp-Source: AGs4zMYcSJTIxI/DyQmHdDdf0fEGCOZC0cM1wrsoJEusXTDlruzI4EXWYrB8LMGk9uBqyC774EMp X-Received: by 10.28.36.194 with SMTP id k185mr4903490wmk.26.1510959310591; Fri, 17 Nov 2017 14:55:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510959310; cv=none; d=google.com; s=arc-20160816; b=xAoYNsQgrkjBuvfxAXVMuOPxda+UWPNZuSw49a1CapUIEziwOW4VcoKYxGgysfxG7K ih9cNeteq2OPitk5CtNpWeZGp6sGNZD9uXLO7DmnCbrh8q/eLfsUZvc6JMYSTRnpqYF6 oXOpV+8yZMp/lbeE8zFRVJeTtJvYCNARRZWkMYm+plf0aBzVQ9VWG3KKTqvlyO+raFK+ Vim/GdvXfDXkFmCYz3cEpos3djP8Fvohfe7wCwFcZU+qIGQ3ieQLoq+AYL0eCl/+v4f9 g4DwtHKWhIulPAFBVg1m+9ravzD34yzXYQkKMrsGG3PDCDHMVvwsDZIORNFd7J4qMr3R WGUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:dkim-signature :delivered-to:arc-authentication-results; bh=1ae9wNnZHjK9HzCjyrBHeYtsO0B+3ELulOXOcLx9OmY=; b=X/w6o/qZZxzs7JqO2ssqi3CgXw9mbjbU/t4nwuslAtiNRODcJIBnjiGmHb4vGk5Lsa G1vPBNdcbtPhSRlbVyZuU2omNVm3nCiDD3a7rBXRKd2oG73ibf4m9+Et/T3EQDKdBa6I fbs7uC3MsCXvAHtIwA4VkgWZTWgMq2Z3adGI1idZYi80AnXXY1ys6cUjGTo4+cmUbB/u ZQqCM63R/lAgEzWnUbNylXCUSbAwDjRbo85zrmz3ywcqqGsWWIkeFQVGtjoHhlxSVd/o OkgsHvFGkD53ZIXE/AiR6sTzLBFkOO1kKoJs97fHiH7TOcwJhhgYQEah0xULiddLHY2W mQsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=bJyG3Ia/; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=OPEj+zqj; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v22si3460422wrd.388.2017.11.17.14.55.10; Fri, 17 Nov 2017 14:55:10 -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; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=bJyG3Ia/; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=OPEj+zqj; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 160EC689211; Sat, 18 Nov 2017 00:54:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C96E680A24 for ; Sat, 18 Nov 2017 00:54:46 +0200 (EET) Received: by mail-wm0-f50.google.com with SMTP id b189so9064911wmd.5 for ; Fri, 17 Nov 2017 14:55:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:sender:from:date:message-id:subject:to:cc; bh=OiPJQo2/OA0sMEqYExRPzkF1bGXz8qSG9jZ9FksXxrM=; b=bJyG3Ia/QtXIJm8InQhz2f77MJlna25Bt6wbHhnOkJqnDH5gNAUOetUQHfNy5pjCLi hCoO7h8ljR1CC068M/GDUI0alzLCEznooUtane+OEyfIhpDmg6UgKLUh+jbIsGDaaztM 38pSgSa9yON1n7QRO6TdRgiQr/VfnNxCB5nzqA2e8kzXw+jI5qG46KybAIWrZRTAr2s0 M0WX3G0byDJVsO/kwJyP/s/ScbW3eQM8s7aPifPTpnQzfDT67cvREYvMbrXfCT/iOm46 WidFIYjBo16VjoWQShQQIjCa/pl9FHLuuHPv+tG3DxpmC56XfoHt7Yh409I+Q+n9w0J1 5iLA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:sender:from:date:message-id:subject:to:cc; bh=OiPJQo2/OA0sMEqYExRPzkF1bGXz8qSG9jZ9FksXxrM=; b=OPEj+zqj7BICgedlFpg8IIVydARWLMWdQ5WVXdYDrPzI6287Jzvrhdc3TDUnYYsiKD 7i1sLChUTGub9j+rVOiJkBwczJGF/LqJJsb63mjy2NLkn6XkOCAGmp1xKP5FV8t+P6AW qg83j6xqQFPE1cakMjQXbuB/r7g56EKfQVUjs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to:cc; bh=OiPJQo2/OA0sMEqYExRPzkF1bGXz8qSG9jZ9FksXxrM=; b=BsO/rSPnpN9N1Yqz6Mmu+rgWRmYJ9UPrxchvjqSUuvzLp8UqXYIQKCUpngjYb8Fbcj 8NrKTC5Lvc1c09XJ1IwoIq5PvQrbYTyF49+s4OqKmhcttY7rwUM3Pv2JLfGEiDMzMHcz bvc6G9XrzVMYgKXutYNV5MqL/GIWZ0fCucx/NYe+ssRYibsvRJNHukGtdiw22VmSZP+4 QK2FEAmPwPMjwHwMHnYX5kbOI8If5Oz4wcM8LOeTWwpEPQFans9qY1wGFD2b6IwT/XF3 1E6bScX64vhsS+q28qyDQ4y6Lsy2cCeDB4GhF1mE+H1jvjjeDDPNy+Lq0u4RmG/ve+SY mD5A== X-Gm-Message-State: AJaThX6tPIXSh6vx/PJRl8Sc23Ux5Jcv5cR/KFy20y9RF8cwWoFFctd3 SHPTJE345X1E2ASUi3pc6TxiKAuMp8LlFUlL/ghZ4ji+pSo= X-Received: by 10.28.168.88 with SMTP id r85mr5855507wme.63.1510959301518; Fri, 17 Nov 2017 14:55:01 -0800 (PST) MIME-Version: 1.0 Received: by 10.28.161.4 with HTTP; Fri, 17 Nov 2017 14:54:40 -0800 (PST) From: Dale Curtis Date: Fri, 17 Nov 2017 14:54:40 -0800 X-Google-Sender-Auth: oP2GdVxT_sES4u2qUeYN5mZ5fJM Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [mov] Fix leak of frame_duration_buffer in mov_fix_index(). 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 Cc: Sasi Inguva Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Should be unconditionally freed at the end of mov_fix_index() in case it hasn't been used during the fix up. Signed-off-by: Dale Curtis From bbdf90542a98bb297d4143949e3281500815d0b1 Mon Sep 17 00:00:00 2001 From: Dale Curtis Date: Fri, 17 Nov 2017 14:53:25 -0800 Subject: [PATCH] [mov] Fix leak of frame_duration_buffer in mov_fix_index(). Should be unconditionally freed at the end of mov_fix_index() in case it hasn't been used during the fix up. Signed-off-by: Dale Curtis --- libavformat/mov.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index d49d820d2b..3eef043046 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3553,6 +3553,7 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) // Free the old index and the old CTTS structures av_free(e_old); av_free(ctts_data_old); + av_freep(&frame_duration_buffer); // Null terminate the index ranges array current_index_range++; -- 2.15.0.448.gf294e3d99a-goog