From patchwork Mon Sep 14 05:27:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22377 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:c650:0:0:0:0:0 with SMTP id k77csp893790ybf; Sun, 13 Sep 2020 22:36:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwA8TbJRu6pvxv4Odh3Y/jK0zyLaDiik6z3et6xp519LBnNm6a2jf51ILB1WU6dunJ/PQC1 X-Received: by 2002:a5d:4d48:: with SMTP id a8mr13723019wru.318.1600061778953; Sun, 13 Sep 2020 22:36:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600061778; cv=none; d=google.com; s=arc-20160816; b=aEJB8dXLPG8GBond5s6CBYOxYqKj0/WfDJx+7eTFbPZD/dGEkxvILP6thDdT6i9ki0 e0cLiPcEfzordPWm7dBfHSQ/X0SN68e1nMgKdPFM1zZPK6jmd/kW6KOZCfzmKTZrLMgM yva8YVQCVFZ2w42o2fE6W1O4sHpSFe1+mlatSU8SOeZrjRPnG1BhaJ5e7xw5ChxlDvTt oS9Qe2r0YuV9PL1rxQRoT8Cx9kRURrml6DxjT4ch9/OmKOvJLwPUCDYcpg8dECiIB6Bb CdOp418wXTjTYvLyOmXHV6yu4emSmGTKrHBbyvYE6A39WCJt9dZC5lZVBex6ZhJcrdRT pQAw== 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:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=RsOQ+x7hburvYyyRYZS/0dHioGFiUvaVO70QH5l/vEE=; b=gWaviAdnygbv0Ve3xccGL/McpqEeP5fASKYORQw97xIx+u72+aA9ilg21uwJfipAf6 KCXXSGY9Q2WEwHJmjZUru6YfgwhX/AFpvZ7MuRxo7WnkObwhLjSr8NULHOWbwXLJdSbA klnYjAM2WzM8B8IwiG8QfweIB7wO4e1Guiq/RB6ud0NqBHP/YIEXfoC5iWQHgrkuN2+l RwfUp9b4KPyxBUTeUw9bRSrLM/KkHrcE2hDgtiICc0WlXmKmW9nspFPkrRWR9xsNetTG vXAOMXirZL6vMFRiYjNV4vvr6E8nIKDS6Fg50Awl4LEqmEy+c6Z2ibJdh6OOYEXFnj7C Uleg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QJ6wp9r1; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g67si9137491wma.107.2020.09.13.22.36.18; Sun, 13 Sep 2020 22:36:18 -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 header.s=20161025 header.b=QJ6wp9r1; 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=QUARANTINE 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 21E0868BC3E; Mon, 14 Sep 2020 08:36:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA9CB68BC55 for ; Mon, 14 Sep 2020 08:36:01 +0300 (EEST) Received: by mail-ed1-f65.google.com with SMTP id e22so5747204edq.6 for ; Sun, 13 Sep 2020 22:36:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eM4k9NrJKaSaU4F2oVU6KerpWXvC+swmb0YG6+Hr+Zw=; b=QJ6wp9r1s5ylZb4vqTM60UzXLEXN28WYzRWqmX4+Wlsm4L+4zk6ghgkgkUBmNGHY3l uInWsyDCkLXwMDc7eZga/LFgafvgFZfZECe8GzwiYsbIRoQc+naqAH0i/3rp5tmSnqq5 SW2OCBRil5CnWGGZTR5seWt/PsC577SwK/ohbw8u75o+D7KvRv28pCmfVd4eRwAFL1j6 iTyI1Fyrpsu7Kw6os2BosDsPWd9UXGvO3y7ROgthmPBKbXR+4QQxo43uVk+qmJ27KYZ/ dfOLn84smMYE+n7PaD1VxH28xm1hnmcU14Adce0NRny/r2GBiHVUcyCZ15UTcEjXKfdr U7ew== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=eM4k9NrJKaSaU4F2oVU6KerpWXvC+swmb0YG6+Hr+Zw=; b=gX/t8zUXQSal/n/Z4stjscN2KgQtNajf/jXbD2xk86TLIln3L9PJ+bsmOoedfFVxrm /px0T9LxsTI3wEe1xjHKcQAh4qPqdCpT9Es+7WjsMZhtHOTwWxPB7b82bgPQbINEXyD/ Z4nD1RMDNPJ34wiCAwEH5ZssQpk0/EEnX/npaZfy4hUb9sOQ8mYPgDLRUWlhKPswRQ7k xOJhCtIE88OoYLIaupalOZXvSxv1uzQIJTn1bLJOtLTywAI6w0EoAMUJVpNO0jF/Ipwe jBl6+PMHK2Y9HmSxO3kWl88eKqdBM25Dxs9JoZeZ+qGkg38mt2/7HlnXnotGc6QUdsD/ dr+Q== X-Gm-Message-State: AOAM532r5SrShaqpyA6M9qiKNuc2hKFmK5D+EUhp9yQw9gnlkPuXRK40 9SCxbzxXMzqWsdRioKCVimUvk2hmvp0= X-Received: by 2002:a50:a418:: with SMTP id u24mr15080322edb.193.1600061305616; Sun, 13 Sep 2020 22:28:25 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id f4sm8251421edm.76.2020.09.13.22.28.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Sep 2020 22:28:25 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 Sep 2020 07:27:34 +0200 Message-Id: <20200914052747.124118-11-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200913025753.274772-1-andreas.rheinhardt@gmail.com> References: <20200913025753.274772-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 27/40] avcodec/avrndec: Fix memleak on error 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: U26xNq5TrjWM Content-Length: 1314 If ff_codec_open2_recursive() fails, the already allocated AVCodecContext leaks. Fix this by setting the FF_CODEC_CAP_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavcodec/avrndec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/avrndec.c b/libavcodec/avrndec.c index a4b6fadfc8..c5a60acd4f 100644 --- a/libavcodec/avrndec.c +++ b/libavcodec/avrndec.c @@ -170,5 +170,5 @@ AVCodec ff_avrn_decoder = { .close = end, .decode = decode_frame, .max_lowres = 3, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };