From patchwork Mon Apr 24 22:47:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3485 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp1650962vsd; Mon, 24 Apr 2017 15:48:40 -0700 (PDT) X-Received: by 10.28.198.10 with SMTP id w10mr10448638wmf.1.1493074120705; Mon, 24 Apr 2017 15:48:40 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v130si1034174wmv.161.2017.04.24.15.48.40; Mon, 24 Apr 2017 15:48:40 -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=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6E33A6899C4; Tue, 25 Apr 2017 01:48:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E38806898B7 for ; Tue, 25 Apr 2017 01:48:22 +0300 (EEST) Received: by mail-qt0-f195.google.com with SMTP id o36so22680722qtb.2 for ; Mon, 24 Apr 2017 15:48:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=BnDPELJ4WYCnSsiuCCBwsFXnwbzeje4qVi354QYm6XQ=; b=GyrENEH/bkGrzzKIYuWzJc0ALHEb47qWSXnPaaK95ZLpMBi3zY8x46vSbpKuaFyT9+ jdtTH81QUdDXPH+oAbQwUsSEWIkNVpNVr4XjDLGpPGz11K6tMXdhOYQbUJ45qqUQ8XIH K5TXzP0P6OYD26430uOHQghu/NhOupOpvgFwSUtQM7KLhKMrXXJf8FkpwxiBBpFnc6uv v8I5MZX693PsLcTAguMUmK14FQpLZdDx3RwzeCGGFAMFYV5s1XMkp4hdx2XaxUTFYo6D DWTd1THRINXQI53T+MLmWpgI+0ZZFlJ+XWZjyabx9BkI195HH/mDNIEBsJ3loN5MoI9w 6H5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=BnDPELJ4WYCnSsiuCCBwsFXnwbzeje4qVi354QYm6XQ=; b=Lh97BvLgXr7DPIhE1agEdtnKtqQgWU4gmP3Hh/cSArGhbMh3NQcP8kUOIW0vZG4ePt lVLdzZLtNRPX6Hsaqel/TTGH6fL8l5dCATbqlJINP/gJUHfumtuCHSXfyTK39xJ+DqsH /amGPXorQJPcnLeT/oW/zgx1UkL/RHIk1g7VNznxG18Uee8xBUXcc9SZm3QsVI7iGBS9 To5g9+IBVmKwmhHYVKxS6pVkCyuSITjHFTD64WN20GfpZX7EcshZjiQAar5DL6sknV2v AskEKJTvBmP6Q9E8Cz1JyNiqdRpRnDmuwKyLDS7MSrr/tLSOTYOhbl4u3ESQqOw1oyvm 9Ecw== X-Gm-Message-State: AN3rC/6SNHfvfv6oQlKw/NCV8prftRwFnmD3JbjXb8SuJvhJlovLbe0G VxMvlnvK7yUDsuGh X-Received: by 10.237.49.161 with SMTP id 30mr30538266qth.53.1493074102860; Mon, 24 Apr 2017 15:48:22 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id a2sm13867557qte.64.2017.04.24.15.48.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Apr 2017 15:48:22 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Apr 2017 19:47:46 -0300 Message-Id: <20170424224746.2172-2-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170424224746.2172-1-jamrial@gmail.com> References: <20170424224746.2172-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/options: do a more thorough clean up in avcodec_copy_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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Free coded_frame, coded_side_data and unref hw_device_ctx to prevent potential leaks. Signed-off-by: James Almer --- libavcodec/options.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libavcodec/options.c b/libavcodec/options.c index b98da9378a..82e12179a6 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -190,14 +190,26 @@ void avcodec_free_context(AVCodecContext **pavctx) #if FF_API_COPY_CONTEXT static void copy_context_reset(AVCodecContext *avctx) { + int i; + av_opt_free(avctx); +#if FF_API_CODED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS + av_frame_free(&avctx->coded_frame); +FF_ENABLE_DEPRECATION_WARNINGS +#endif av_freep(&avctx->rc_override); av_freep(&avctx->intra_matrix); av_freep(&avctx->inter_matrix); av_freep(&avctx->extradata); av_freep(&avctx->subtitle_header); av_buffer_unref(&avctx->hw_frames_ctx); + av_buffer_unref(&avctx->hw_device_ctx); + for (i = 0; i < avctx->nb_coded_side_data; i++) + av_freep(&avctx->coded_side_data[i].data); + av_freep(&avctx->coded_side_data); avctx->subtitle_header_size = 0; + avctx->nb_coded_side_data = 0; avctx->extradata_size = 0; } @@ -238,11 +250,14 @@ FF_ENABLE_DEPRECATION_WARNINGS /* reallocate values that should be allocated separately */ dest->extradata = NULL; + dest->coded_side_data = NULL; dest->intra_matrix = NULL; dest->inter_matrix = NULL; dest->rc_override = NULL; dest->subtitle_header = NULL; dest->hw_frames_ctx = NULL; + dest->hw_device_ctx = NULL; + dest->nb_coded_side_data = 0; #define alloc_and_copy_or_fail(obj, size, pad) \ if (src->obj && size > 0) { \