From patchwork Fri Sep 14 07:25:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Linjie" X-Patchwork-Id: 10323 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp360690jap; Fri, 14 Sep 2018 00:25:48 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZ/bh9mPpqLvrOvyOdnlUM8dVJ5Wvc7PMwuX3EY/DUDKHV2/BzEJkYDu1haxYYsoAhEj8/R X-Received: by 2002:a1c:2283:: with SMTP id i125-v6mr1222746wmi.28.1536909948072; Fri, 14 Sep 2018 00:25:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536909948; cv=none; d=google.com; s=arc-20160816; b=JBnH1JeTgI2u7My3qIrEKNRA4+7JVTI0qzKMXnjzZBcNqbfFcUCXtCsf7boisjvKcm sE3Clx8fZ3gyQud3siLYBDI9HGkI0R/K922KU/YSJ04osGK8yiToA4PK33zQbbLKsIBe ijTMoWxD69HDLamfFSe+px3Lh+Q80G3JjGZJGhZIDjO7+D7+ZoMGkTsv7VE/37R7pTl5 arjWbNV8l5swJ/4Obxe2nsdfdvA5I2mFGVc2SjNhQkOB1EgFK64OigEMrwZ2VUN73fa7 90gSR7SRFJ3RQPCXfi5cEPtXwcxq76h/JXgySn6tN/kqE2wKuL/1TdwBIdP7tt2ze0k5 2pxw== 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:delivered-to; bh=9bvxwh7vEIokO51A5oEuatzQZO361ozV6IkHcb0fTSM=; b=w5F/AF1mwDP/nwMBf8pUYJcW31ITjzuX6OHSYqYKkrnfiX1gt9MaWgHCN0W78PRvox 9rtHzCNaRVDIcH2vlYjpXj+fPffOgn4cN8Y+ktHTjuW61/3waL2E4oUlq/bPXPHhMVhV P9dZIGs0/hYoWfnbVwfWElTAD0DTGq97QjHfylAdIE/hRVdd4EmVc+2vojVsjKuQoaO0 GOl60/pU+9/rQt9Hg8oqXGDBRyFx7IwrJOFIixiNST+CYYaSKjp5RGX8RPY85zvSx7Ga Iv8jl51sgLj5laV3monhudQePq6IF6Gmy3n4ZVjh46kS4dxd1j1ZczsaUcsmQXrzn+5J FG+w== ARC-Authentication-Results: i=1; mx.google.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=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 65-v6si915500wmd.69.2018.09.14.00.25.47; Fri, 14 Sep 2018 00:25:48 -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; 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=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1677868A607; Fri, 14 Sep 2018 10:25:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89C2268A39C for ; Fri, 14 Sep 2018 10:25:28 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Sep 2018 00:25:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,372,1531810800"; d="scan'208";a="262544538" Received: from kubernetes-master.sh.intel.com ([10.239.159.161]) by fmsmga005.fm.intel.com with ESMTP; 14 Sep 2018 00:25:36 -0700 From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Sep 2018 15:25:34 +0800 Message-Id: <20180914072534.9737-1-linjie.fu@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodec/vaapi:free slice_buffers when decoding failed 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: Linjie Fu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" If vaEndPicture failed in ff_vaapi_decode_issue, free the pic->slice_buffer. Fix the memory leak issue in ticket #7385 Signed-off-by: Linjie Fu --- libavcodec/vaapi_decode.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index d0a6b5817d..700cd5c681 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -216,6 +216,11 @@ fail_with_picture: fail: ff_vaapi_decode_destroy_buffers(avctx, pic); fail_at_end: + pic->nb_param_buffers = 0; + pic->nb_slices = 0; + pic->slices_allocated = 0; + av_freep(&pic->slice_buffers); + return err; }