From patchwork Thu Apr 19 16:35:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Trimble X-Patchwork-Id: 8503 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp878584jad; Thu, 19 Apr 2018 09:35:54 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/59FI6eERrigJ8a2RC6ATCl9qVIM4d7vQZ80JJbW4o0cKV1CLfr+Npf52xK3Clb3LuC24+ X-Received: by 10.28.141.138 with SMTP id p132mr5376950wmd.51.1524155754450; Thu, 19 Apr 2018 09:35:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524155754; cv=none; d=google.com; s=arc-20160816; b=oiWf2wKFkUi1F0of/X/wmtsnew7V6Gj9fj4+ILg0BoyQ6qABqeWqY5c4GPjHoiWWti mHUFAS5xnCUdKX0KZUZerY0RAvb1inliO5kDFXal2RYx7/jaoVhA5/p4yDNMn6ruWMpO YrcZ/HQ1QKILEcVFhqVVuDz1DpqwEcC+KARLasnYnp+8Zadjyt5UJrlzA7n9CNG02JpG 5fajrO1YtClReOuMHIji0cxDB5Ypg1KwdkE/zC+atfkY/HCChZbCYMFBuQcepYX6Qt9b cQ57q9qY7L0DCgPapu8/wF7OpPIamQCKFQqkA2HsVMvwDn4CHvqv+2ph2vT8irl5G4ls aAOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:from:message-id:date:mime-version :dkim-signature:delivered-to:arc-authentication-results; bh=/zKoxmmH4luR5ba1aExtb1yEExPT9coRlhDht2u8xvE=; b=mzx+J8Fx7IEAkO08CZgcHfJAYR57a/kWcGeZzRreCHc7E5/YE40hori+DZlXm9JCEm WR85TvGaVulJyEOVwfbinZGChF3wVnBSIiwACApfii/dui7eUkNDpJAncqpPqN5vIDeU OWFnwYjVj1CWIEdVlp84DjMgWnfAgLflCauEKJ1MrF4GT/r9Vn2qGSftKDrA0djz1uij WtcydM3AbEm0EHh7J8ulp/kgKOPqjj29f/EvNgHWz9CN/WQM4MP4zeygFvo3jQjrwvdJ y7nRD5NqZcOstI8azxXCrImNQA9Ajfwf5dYGZrxph8YIy8smx8Suh5P7Yr3weMmg6fIC TURw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=ms/qnDkK; 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 d12-v6si2973221wri.23.2018.04.19.09.35.53; Thu, 19 Apr 2018 09:35:54 -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; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=ms/qnDkK; 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 037F2689E21; Thu, 19 Apr 2018 19:35:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f202.google.com (mail-qk0-f202.google.com [209.85.220.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D32D9689CC0 for ; Thu, 19 Apr 2018 19:35:17 +0300 (EEST) Received: by mail-qk0-f202.google.com with SMTP id s138so3782989qke.10 for ; Thu, 19 Apr 2018 09:35:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:date:message-id:subject:from:to:cc; bh=G60QSBp39tNEq2336PYmSThDU1QMRFnO48RagNKucKA=; b=ms/qnDkKigCsbZHyO2yRPVnDcFaoAdsuLWBKLQTXKcm06TnOL5QTUJ04CyxM3+zrn3 n77bm11EMagc1dXgqQzff4G/PqmS0mVbCi2s1WRYdMdcgsZIW8hEp7K4UCRffB0ohBh8 QPXor+oAQYZvrIa4ezXYqNpNYZQLSVdEwwGHBUBpcexcxTt1iCqp0tsiWZwp8Z6O2n3y l8WeAXNdVVWvoru1kBWHh8hCNT5XwagVBEy1ADMfzoR6m/DO4cWKwQjoMbdhTdrfyLba Ndi6o3bEg1WKnecJ9yqI9VvAME/xtBmufkq0FGLmAR4N1VD8g0vTBJg1OgnhpwFuyMwL 7Tuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:message-id:subject:from:to:cc; bh=G60QSBp39tNEq2336PYmSThDU1QMRFnO48RagNKucKA=; b=WLbhS5e150gG5eXMJHQXAu6e8Qyd/grX5OsAe9DBcXIzyZ1lX4cbPIGZTDAXvz4cAT k4iKmKg9LUDBcSxUstRdA01e8RmdlNNliv6k+HnIg1xYft7FP5tLAxzcM3aHjhUTWpAM 2Gpx2hQtBvjSXElOXS4OCbJ4xNuH0e1Erihx6P2sp1gqg7D+sGYAKKgJdfL21s413iRZ VAKWFtVZBk2Oi2M6WeKCHDMls4EtYd9xC1emQ6jMnG5oxQ9daP8e/+W5Ic8DRpKxETtx QyEOkawInwgQiJ/pnIfBeuW+195CgONm9jDnZSALRFpegel70YPMoidpnAH4hHZd+JQp SMow== X-Gm-Message-State: ALQs6tBMCnnBTDh3gdiees5F7DqOQaweu7TQaA0x9twF0uzH8/z9D8Cz Z6/q8rbAPlAYXqbxP10jld43auvvll+vbo434511cLBFogGKHLCGw+Bjl5Kv9IhITNRHixhM/pd vgSmXVUMomf+VwCJKeSsfSrqTPy2kvpwHN2wADO12lj15klOSXkuAESOGST+TW3Iq0LgD MIME-Version: 1.0 X-Received: by 10.55.86.71 with SMTP id k68mr4729629qkb.34.1524155744059; Thu, 19 Apr 2018 09:35:44 -0700 (PDT) Date: Thu, 19 Apr 2018 09:35:22 -0700 Message-Id: <20180419163522.6033-1-modmaker@google.com> X-Mailer: git-send-email 2.17.0.484.g0c8726318c-goog From: Jacob Trimble To: ffmpeg-devel@ffmpeg.org, modmaker@google.com Subject: [FFmpeg-devel] [PATCH] avformat/mov: Fix memory leak in encryption info. 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: Jacob Trimble Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Jacob Trimble --- libavformat/mov.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index fc512b8d72..4eda48d617 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5833,6 +5833,7 @@ static int mov_read_sample_encryption_info(MOVContext *c, AVIOContext *pb, MOVSt if (use_subsamples) { subsample_count = avio_rb16(pb); + av_free((*sample)->subsamples); (*sample)->subsamples = av_mallocz_array(subsample_count, sizeof(*subsamples)); if (!(*sample)->subsamples) { av_encryption_info_free(*sample);