From patchwork Mon Jul 31 18:08:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Siloti X-Patchwork-Id: 4550 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.85 with SMTP id 82csp2696123vsb; Mon, 31 Jul 2017 11:17:08 -0700 (PDT) X-Received: by 10.28.91.11 with SMTP id p11mr11160773wmb.19.1501525023228; Mon, 31 Jul 2017 11:17:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501525023; cv=none; d=google.com; s=arc-20160816; b=Xv+VQFQZNzrCTIAXh9n7ATlj/SYs8HS5h7/nzRvNv4bs63HcvYsGhzvE8gJmxPLOy4 DDticR42OCyFygfpI9mp8Z6AO9CogKSYWbOrWRcrg5dZAla1oxT7aL3b344La/7Dp87E +g19M/gzIQvcNlvB2SQ7TLghdyCzCceQIDnOmhFmgiXFxC4FASu3QsdZgnzQEX0KvrDk wZsO75Rvdtk2W9aYfnJR4oO7oVImE2DjOsfYDfztpW2NSiHYZYhDgp0wMtQIc+6Y7aUy dOMU31mk8EO6NzqCafGk/wJD9B2ipZ9z/gWGmpV2moGOmAX1ftWlj7GKzfS8Od8DdJqG 8uww== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=9htUeDeKxYhccQu4BiI9bgWcC5ee03zEVbyu5Mg63AQ=; b=lYVeiF/3cRyQtn8xTFWgPMOll0u3VR1v8RZAcqQJ6bIsEx4mo1aCeGASKwJaE73Abr ZcmUNV5rgInXMQCY2/P5INDwTxfoqtdFYpHOuSN9xg3hlgrME+zCvQf0AGzFrFyq5Vpn ox6/lWw06Oup8NpyHbQXjYpmeOyae0c1xIAlO87VfhEewahlxyui6BM7o+BPINgPZO/G f9eXOqWyxY3OogdHxhD7cH8SIK2KRXXwK42oRRuw2CdDwxn42tnhCQSGzxkD3TbCbvBr Ay1PlICEF3V+5KI2bJwLzFJ7/povb3EE88O/bzvlkwe9GYL6Or32urai20dR7G3bPB0C Qxvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@bittorrent-com.20150623.gappssmtp.com header.s=20150623 header.b=B+bHxmFq; 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 q188si1018837wmb.71.2017.07.31.11.17.01; Mon, 31 Jul 2017 11:17:03 -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=@bittorrent-com.20150623.gappssmtp.com header.s=20150623 header.b=B+bHxmFq; 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 1DB3468A1FB; Mon, 31 Jul 2017 21:16:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f177.google.com (mail-pf0-f177.google.com [209.85.192.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9F9568A19C for ; Mon, 31 Jul 2017 21:16:48 +0300 (EEST) Received: by mail-pf0-f177.google.com with SMTP id z129so84586607pfb.3 for ; Mon, 31 Jul 2017 11:16:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bittorrent-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=xMnw/hXbEgQiN2f9wMx0JTTBVXOPhsmPCKPFrGH6yLI=; b=B+bHxmFqIQCbM13JWCn2DZMjyWwFwJHUmzNia9R2cNCa66XVG3b3RGejgluJLjsW/T SmI22q/UXEXu44LO+1+cNUQSCAatEILFtreyBgwqdlkStNnw05daleWW6Q1IstazjU5z lBPBsiBcF9pvM1QX8GF3Njs8pfXIwC68QFwLBITJS5EtGgrpAr0e7CugcGzFanWXHrZA 8i3F/jWbrw4f3aG8YqgxC4g/1uEqwLOI/HvRce5fSP/1Tr+bN5b0Wa+81lHVRI2B8kyz 2xwfuLUcPaLbGai7VSAFB2FPbHwQkGPJ5/Ovck/FC2BFLMFcyJG+l87Bfla8bAZDcAuv kVYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=xMnw/hXbEgQiN2f9wMx0JTTBVXOPhsmPCKPFrGH6yLI=; b=CUKV4PKnUp9UrMAvvcPSRdwK9gAzaKF9+6WY25Kdb5t1G8k8ZGd1z9dOvsZmK244UP zymiOgVt1y0W6ywJe29xrmCHY75v6LUQjkKLLlxX0+IptQJZHJzhN1nOhHsN36H8TC4P SeY5zZUulFlbXAVyiX91fjbI28w0L4AKIn/lAZDz5GSEfNivwYRDHrRnEmbaGLRWOo0L cnqy14gHKbEjhLYEkZTbdVDkgSYfelf6XYAOBRyA9u/zuiOidyn0K4JwRNxIO9+cQrkE 8IvYdQIaqdX7b2+fcTn6y1uZlAsWXPdJhpFq0OLmY+ClMGyG761ItyyI19ED4wUqeaeh 5zhg== X-Gm-Message-State: AIVw111xnsdRbT+qUb8dP9I0bm88qgvnbxla2Jb0MPrea2/BLrHU64MR pC1DJwxoRnuGo8rEQ6tbMw== X-Received: by 10.84.232.15 with SMTP id h15mr17753406plk.189.1501524527087; Mon, 31 Jul 2017 11:08:47 -0700 (PDT) Received: from localhost.localdomain (50-202-99-166-static.hfc.comcastbusiness.net. [50.202.99.166]) by smtp.gmail.com with ESMTPSA id o13sm53569925pgr.40.2017.07.31.11.08.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 31 Jul 2017 11:08:46 -0700 (PDT) From: Steven Siloti To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 Jul 2017 11:08:20 -0700 Message-Id: <20170731180820.13180-1-ssiloti@bittorrent.com> X-Mailer: git-send-email 2.13.0.windows.1 Subject: [FFmpeg-devel] [PATCH] avformat/utils: fix memory leak in avformat_free_context 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: Steven Siloti MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The pointer to the packet queue is stored in the internal structure so the queue needs to be flushed before internal is freed. Signed-off-by: Steven Siloti --- libavformat/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 38d247c6cd..58283616dc 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4333,8 +4333,8 @@ void avformat_free_context(AVFormatContext *s) av_dict_free(&s->metadata); av_dict_free(&s->internal->id3v2_meta); av_freep(&s->streams); - av_freep(&s->internal); flush_packet_queue(s); + av_freep(&s->internal); av_free(s); }