From patchwork Thu Jul 4 13:43:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Bouron X-Patchwork-Id: 13814 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 179D1448BB2 for ; Thu, 4 Jul 2019 16:50:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C9ED268AB74; Thu, 4 Jul 2019 16:50:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A23D68AB41 for ; Thu, 4 Jul 2019 16:50:14 +0300 (EEST) Received: by mail-wm1-f42.google.com with SMTP id a15so5820592wmj.5 for ; Thu, 04 Jul 2019 06:50:14 -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=Crpg3GzroXfPU8NObWHCIxsTpRZGgWRbpsD8oDi7LDo=; b=p8FFZtgtxj6HS1iBWb1/p4DBigHpXPLuK0DL7AbWXhaCKA4CNPpvj4s2mbqLaOoivp nbKt0UPEqdx7lTyPYo/kxlqpGhS/ObgTVtMxPbdLYx41axL0t5tsj95rL+Te7pwx5A0m Vts9obK9BJ+B+mYq42+pw51ARTfq1t4Eqi+zKLKou8n7NfdMFI2BX7bXC+R3GhuvjUyL VtTyeIi3Fa+0EvA7/tCgI6Cqbuy7xKTxDj8/oInVkxU44b+s3D36r5T0wVcSO6g7wyOb WtkpbmDdW6CrMe4JXExSk6ld+z6gxf+Cx5y8CVPvM5PH7GfTrvppd5/8mrACXoLzJ13t 32+A== 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=Crpg3GzroXfPU8NObWHCIxsTpRZGgWRbpsD8oDi7LDo=; b=gLvRJoPYy2btuSNhilw+zZYVzTqrmcQpblv8XdlF97GBX61snXcP5U573FbZAXBrWN pJoH4jn/FT4gboEcsIFvmp6Od+RPdniTNRynLXZBIM9b+Oyp8XOMFCpEirVDCYpoqZkl BfPdaAa52B/S7JZwjx6lTkTRk+bSMSg1u6N/9TFmaOCUgHQI64DzlhP3La8nFy9nTKB+ F7+S3/8FRh5olXMSrcppCfp6HstVy0JK6rUEU1+OO7qEp+/1rEavkAc8QCOS8x2wH1V9 xN24865nMsHChG/C5s2NQxWOO+t1AX2lVv6WKAMA4TWlhQtm30HBuir/9BFkIgks2zon 745g== X-Gm-Message-State: APjAAAUxOife2xVJ4pgyRAEU7BuNRMeb15hZtttFy7URSgH4wVtgMh6e I1ByKWKyr9zJAU3Fi3oe2BcWB7fl X-Google-Smtp-Source: APXvYqzVirnsPi2HzXpLqbZv3qT3JenwWcYgSohDcgU4gUtiT+5qBf7gWWForP4Mm5tMt1znNXKQzg== X-Received: by 2002:a1c:a6d3:: with SMTP id p202mr13263466wme.26.1562247861720; Thu, 04 Jul 2019 06:44:21 -0700 (PDT) Received: from boken.gopro.lcl (73.136-14-84.ripe.coltfrance.com. [84.14.136.73]) by smtp.gmail.com with ESMTPSA id o7sm1440835wmc.36.2019.07.04.06.44.20 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 04 Jul 2019 06:44:20 -0700 (PDT) From: Matthieu Bouron To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Jul 2019 15:43:47 +0200 Message-Id: <20190704134348.6071-3-matthieu.bouron@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190704134348.6071-1-matthieu.bouron@gmail.com> References: <20190704134348.6071-1-matthieu.bouron@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/mediacodec_wrapper: fix a potential local reference leak in ff_AMediaCodec_getCodecNameByType() 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: Matthieu Bouron Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/mediacodec_wrapper.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/mediacodec_wrapper.c b/libavcodec/mediacodec_wrapper.c index e2df07cb41..70e1e7cae1 100644 --- a/libavcodec/mediacodec_wrapper.c +++ b/libavcodec/mediacodec_wrapper.c @@ -469,6 +469,11 @@ char *ff_AMediaCodecList_getCodecNameByType(const char *mime, int profile, int e goto done; } + if (codec_name) { + (*env)->DeleteLocalRef(env, codec_name); + codec_name = NULL; + } + /* Skip software decoders */ if ( strstr(name, "OMX.google") ||