From patchwork Thu Dec 14 10:09:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Bouron X-Patchwork-Id: 6768 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp6543366jah; Thu, 14 Dec 2017 02:16:36 -0800 (PST) X-Google-Smtp-Source: ACJfBosuiMehAJ4bu0N5fnKAHpG9gtN/vlizNNUJ190FQN0vjA9SqIXzCY/9BE0+e0NxTbkjOTpj X-Received: by 10.28.216.196 with SMTP id p187mr1533027wmg.158.1513246596584; Thu, 14 Dec 2017 02:16:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513246596; cv=none; d=google.com; s=arc-20160816; b=U2kiS2+GwjpEhP57BjCuL7TeirzgPOo9fVSVwTEie9jVj5doKWRgvMe4Qx7wz3lGlM /kciKpAU8N2DaGv1hOspEp2qUJPAOd3Dw+aoJrXt7hfVyfICRZDtl4L5/PN9K7JSuGHO Q5alqy0TWS//RZWJAmUSC/cfLn8jfz969N7K2J7Knz4cagoyWgo+Al2AVDRXZ1+fk36D Bz7+MB/uOFJ8Wq/GeEWJPYNZpnilaQzFZKhQpP47LSj7lKKvyRG+8Bi1+8Q6iuUHVI8i h+cMpWpZ4QbYADGz93atO7Ro9UHDpHV1pbwtihExL9VVJDwqDkDSxTFucFi4bji9dJy3 rsjw== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=iIKgV6an9J3Nx9w3qt/kyWmBRdJuc2AeOXPOFdUJ1RE=; b=d6iaRpT1y2oNLMQ8HcZ9t3JWps8p8onkKOS/cYOQSMqgs/qAJDzH7cafS9sNVP9SZr XVl4BDdnVtoFq0CsX+Vk/wxUWvOGs+kb1UHJbXa3A0A7qhfC6oyea3OmTXLx/E9Lvv9z ltRZUWQLg0+xXLGOGtSd8wh9YFbCO2WzDz1RDx1I07pNPFla5zN/e5Syj4Df747JWai3 jfAdw4P0FXs0sJR24AIVB40k+qbEvCHGXXNexKkI1OdRG2Iaeq91ysWQ4387CU8eIyLx YwWrMJVjLaTxuFnx5blrsdq0S0uoX/45TL5QR2ol2RNc0Rna2beBxlVIvYQ5zLqac8y0 W+Wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=RIUa48FZ; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z54si3026728wrz.283.2017.12.14.02.16.36; Thu, 14 Dec 2017 02:16:36 -0800 (PST) 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=RIUa48FZ; 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 5876C68A1B6; Thu, 14 Dec 2017 12:16:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F55968A1B6 for ; Thu, 14 Dec 2017 12:16:20 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id r78so10265600wme.5 for ; Thu, 14 Dec 2017 02:16:29 -0800 (PST) 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; bh=8aJfkUDVbVojNWB/ssr0EDynyvRQ9eebfXZ5GBD8Sb4=; b=RIUa48FZUHIaFW95URFCTXMIFZfyY6ipClLy5RSe0JU0rHXKWNGw89PjtkkJQiPrTT gI3Wjn+hFPxf0cpNkcOG/ZrNgdlwJrYCWYzmnQcuWkA1BWRa5CNenayioFxwW3QJjWEA lFoewqdJdpVCIeYqtVV7jegsEl35nLdVAA4otIOiX+V9U4wh7l2eiQIQUXnC6kRKAN0a Iyyrmm/8gDdh1Ei8/G2mvxqMVm+Cm0GZde7XaBhftyJx81L23mUGn8KIPryA2dHrq3HI hFEoyvEOajvXXrLi0xr+9p4pN+J5OASrJsYigKBtKjeN30lqMETOEJGZ/dDwxBkYVoay R5Ew== 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; bh=8aJfkUDVbVojNWB/ssr0EDynyvRQ9eebfXZ5GBD8Sb4=; b=nhGL3Ia9ayDl8AoMQcXKrD411hiYA+SFmoeJpvw51u475F9UjS7UoUd2TAj9CZR+KK tYTDDgmGp7vtBkbsyeCIHwamydr0cFCYAbSoQWUnY86BZkP9mF5FK3EfAPaPD1H57gBg rB1BOjT1++V0ITHZ5tmA6ZlsChYbPlhpGmK0w6L5n7xk8AfPft5wZ0mjiQy+eW6BNMbz 0JX5OWdWcNObi4CUWrDmDwlsNHCJCiwcKm57TCmV6k5z9KxJpnRoY1dSJNgucWYN1KDv lWTMkWUfFduI2a3+s5XWiUP3XnZHrTkMlJjSzTJkm9fC+G+qiU8gGkWj5mGk1Hf3x8kt JUKA== X-Gm-Message-State: AKGB3mIGY8G0LRa+ztGPLme9TXPXptC0OSTMocEbbckwZ96qHl38T6G7 Rj9UMzVoWYj+IbpeZQYXWrHifA== X-Received: by 10.28.58.15 with SMTP id h15mr1571261wma.150.1513246169235; Thu, 14 Dec 2017 02:09:29 -0800 (PST) Received: from kusa.lan (AMontsouris-653-1-284-55.w90-44.abo.wanadoo.fr. [90.44.35.55]) by smtp.gmail.com with ESMTPSA id f56sm5810018wra.75.2017.12.14.02.09.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Dec 2017 02:09:28 -0800 (PST) From: Matthieu Bouron To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Dec 2017 11:09:14 +0100 Message-Id: <20171214100914.10743-2-matthieu.bouron@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171214100914.10743-1-matthieu.bouron@gmail.com> References: <20171214100914.10743-1-matthieu.bouron@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] lavc/mediacodec_wrapper: fix potential jni global reference leak 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/mediacodec_wrapper.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/mediacodec_wrapper.c b/libavcodec/mediacodec_wrapper.c index 4660e895ca..f54e06b0ef 100644 --- a/libavcodec/mediacodec_wrapper.c +++ b/libavcodec/mediacodec_wrapper.c @@ -1194,6 +1194,9 @@ fail: } \ \ if (ret < 0) { \ + if (codec->object) { \ + (*env)->DeleteGlobalRef(env, codec->object); \ + } \ ff_jni_reset_jfields(env, &codec->jfields, jni_amediacodec_mapping, 1, codec); \ av_freep(&codec); \ } \