From patchwork Mon Mar 5 21:54:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wolenetz X-Patchwork-Id: 7816 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp3026479jaj; Mon, 5 Mar 2018 13:55:39 -0800 (PST) X-Google-Smtp-Source: AG47ELto0/RDq7bsE+Ls8SMS46+gEpJ17089s/2CNZXDxXNWCiRPC/iFUmtzUeTX32MZovUiZrER X-Received: by 10.28.84.19 with SMTP id i19mr8764320wmb.7.1520286939195; Mon, 05 Mar 2018 13:55:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520286939; cv=none; d=google.com; s=arc-20160816; b=WodKtUNyylpeqO6gSNRhTp7gyWBFyhutt6t10UxEunOpCmWcIjUFD+vMV+oL70SdCp 19bYwj68lEICBP87BBEvM4/nHD5LrQOGhXtKyhu88fPwzMT64cjyfk9k20BZ3ZzZ+gaa kn65+5lWd7BFrQ2N+ByVwLmiYCN6BQ9B+0vmT72QExxP8cm0bOgBdrLRX7SW1XkFonAY ulk3vmfNFwlvEFEqErLmI+q1woqRHYaouzaMCDOxTzEt8HIKVWzM3+h+zA57XGvWYTHx uXGGKrq5ycQ5T8MQifZ3XUJdE+acQAj/qZocYsRENuK0sE1zHIVNebtYsAKYb/KUJc1V rkTg== 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:delivered-to :arc-authentication-results; bh=3Ns1MeAe2JvVi+Xo5gTA7m4ro/P/ciz/XPEv84d8+yo=; b=FgWjeSaCp1JXI11YIBkOuNWcrsqS1R67e8GvnukpP0ehI3g/J1STbGZjnZhbm1c+ov lHW1s9e5/MMIxS6t63PH+QiNK1ojHDjqt+nrmhvYO2crjmpGN4S6p2O7IJVNv/mSHCVp LHkvksOJ2BExLmsu5YyFse/dFeUQPEdH6CFwvB5gChida58Q4EVyzoYb8wvGSsf1FMWn Kcf+4e1QmK8/40hQl32DDmuWRenvvOLvBMzgGusZkEFbJliZKiP1J/Gqa9ktLidueB+5 1J7Lcu5+f7UjUsxNIGya/KWaHv6fLeq6pIon0f2lBfenNf6vnQQifipzN74fBoVWvzjI U3kA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=Ts5DVYAH; 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 c46si10109660wrc.256.2018.03.05.13.55.38; Mon, 05 Mar 2018 13:55:39 -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=@chromium.org header.s=google header.b=Ts5DVYAH; 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 3367B68A28E; Mon, 5 Mar 2018 23:55:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw0-f172.google.com (mail-yw0-f172.google.com [209.85.161.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 597DF68A1F8 for ; Mon, 5 Mar 2018 23:55:22 +0200 (EET) Received: by mail-yw0-f172.google.com with SMTP id m123so4013803ywd.1 for ; Mon, 05 Mar 2018 13:55:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:reply-to:from:date:message-id:subject:to:cc; bh=pILxssQdQSQOYLKm87YYxfTHIDJamwTb691ZI28ubro=; b=Ts5DVYAHOYbFkw+M3CJTmGxZfFplxK6o2vIbHet4/LTGbQGAj5m+aq/8f4tP7sNCG6 FuLGCIXXf/AMdUIEcrdXwy+AT+iiPBOrqcRDKWVZOlnb+cGKNOG/C0Mnv3Jzj0pErlDE GXlbpbA2+8EKwni3aMBfIqAHroCftkJAg0Iy4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:from:date:message-id :subject:to:cc; bh=pILxssQdQSQOYLKm87YYxfTHIDJamwTb691ZI28ubro=; b=JMVSxqKvKTrr8rn1z/J0Is0HmhtRgN+IOXXvv6DnFfW+/ftrkL5ZVDP0qEYrKTIPJj Yu13fx6IZy1R1zDIleZtiTlGvkKtIJRC3/gEwujmRniBKbkMuiIKsv8ExyvtJEC5JS2I NlPsQ8cG5RCk0UKW9GjBqwB3q/RVBLPJyGN4rnaq1p+qgWKonnkh91IgefpO7tZxJK/y gSktvXaGfNTwLnZS22SIyV1MnXZOv4MKjXNXi75ghRbpwmaEBcKhxUGtABdC2iQfZgmV I6LAhtPl+GM4qSfjzYr8XoT1XZlmE5zgI5qKQUtU9a6/xIwhDcXwabhJr0EbuVWRzTa7 eJVQ== X-Gm-Message-State: APf1xPBTT1B5H4VB68hInCMlP6jPKWop/32dbUnPClsIbh2SSo5QcwPK nqBSNkhFD22KMI6ZvjuKdrpRUFmOwCs= X-Received: by 10.13.199.193 with SMTP id j184mr9912563ywd.339.1520286928065; Mon, 05 Mar 2018 13:55:28 -0800 (PST) Received: from mail-yb0-f181.google.com (mail-yb0-f181.google.com. [209.85.213.181]) by smtp.gmail.com with ESMTPSA id v68sm5441830ywf.29.2018.03.05.13.55.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Mar 2018 13:55:27 -0800 (PST) Received: by mail-yb0-f181.google.com with SMTP id h19-v6so6345433ybj.11 for ; Mon, 05 Mar 2018 13:55:27 -0800 (PST) X-Received: by 2002:a25:ba09:: with SMTP id t9-v6mr10013897ybg.324.1520286926692; Mon, 05 Mar 2018 13:55:26 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a25:5f45:0:0:0:0:0 with HTTP; Mon, 5 Mar 2018 13:54:45 -0800 (PST) From: Matthew Wolenetz Date: Mon, 5 Mar 2018 13:54:45 -0800 X-Gmail-Original-Message-ID: Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] lavf/oggparseflac: Free flac extradata before reallocating. 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: =?UTF-8?B?WGlhb2hhbiBXYW5nICjnjovmtojlr5Ip?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 5d28b92d9d164b104e9a47b8183cd7ddedfde366 Mon Sep 17 00:00:00 2001 From: Matt Wolenetz Date: Mon, 5 Mar 2018 12:36:28 -0800 Subject: [PATCH] lavf/oggparseflac: Free flac extradata before reallocating. Otherwise ff_alloc_extradata() just leaks any existing allocated memory. BUG=789835 Change-Id: I8e1c21a16749d28c7f050f5f5d8bffda3b419638 Reviewed-on: https://chromium-review.googlesource.com/949415 Reviewed-by: Xiaohan Wang --- libavformat/oggparseflac.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c index b5f1416a3c..6cb3468022 100644 --- a/libavformat/oggparseflac.c +++ b/libavformat/oggparseflac.c @@ -61,6 +61,7 @@ flac_header (AVFormatContext * s, int idx) st->codecpar->codec_id = AV_CODEC_ID_FLAC; st->need_parsing = AVSTREAM_PARSE_HEADERS; + av_freep(&st->codecpar->extradata); if (ff_alloc_extradata(st->codecpar, FLAC_STREAMINFO_SIZE) < 0) return AVERROR(ENOMEM); memcpy(st->codecpar->extradata, streaminfo_start, st->codecpar->extradata_size); -- 2.16.2.395.g2e18187dfd-goog