From patchwork Tue Feb 13 22:50:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Bouron X-Patchwork-Id: 46248 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c493:b0:19e:cdac:8cce with SMTP id eo19csp42080pzb; Tue, 13 Feb 2024 15:05:46 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX6p4QCR/kJ+XkRwC7/nNDWoqhZgTSCLv5VwZSSo3TGHSsOBz/GeSKjYbY2L5pSaWWH+lTaIrAL7oRIsnJQkly1X5MiN2hMmu2whw== X-Google-Smtp-Source: AGHT+IEX1O8yOIV5PUOJYfg9yn680Mr9UQ+OigtTaEu24F6vCXhlaAXa8jBVl7vza4CC3/NkU5ov X-Received: by 2002:a17:906:c10f:b0:a38:107a:94e9 with SMTP id do15-20020a170906c10f00b00a38107a94e9mr293241ejc.2.1707865546250; Tue, 13 Feb 2024 15:05:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707865546; cv=none; d=google.com; s=arc-20160816; b=TvFbH9+vtUK3JoULJGWW8sATlR3cYkvEskBb4FiPOcH3KuS8wAupgNGJH/UH1J5CDU B3gPtDo2SoVlW9dPplTJAjpDyA474IMtqeutCSbfwsoCfLLJzQxfXZKBb8jYXzUsqrhD TvsBknbEBvUwYtro2x6hcGxaGBPmXTJKCkLrO65RPeHmdyui9FYW45WuETs3eQxyxiW5 34U8cI++QvsWDM+Xf1z4o9LplqZowxRvgidxMHFn4Pmo1Lgd9nAKhqjnszpEDmxPnu2/ PjsS3BubVgTBPYDIf51DU32whoxMgzwDEkoat3sm3EE3TbBV/Ia86sBDngdblDg1PQNV 1w/w== 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=11Tk259HVF50UYYDoRdVcbPkR9aYV9q6IEtNbvJKB7M=; fh=8whsDNFv/4QllJRKh5/3/iXa7DzvmaEE421tRd1MIJ8=; b=wUl/opnl8We/mXn/8rqIiWLMw8igecKaUIGIP9t0PhDsjFr1cFxaXbCXp1amPfPbn4 6mNZHwGo69gjNzvGDJhgxfbX2KUY3K00BnxyaZ4mzgdcNwg7/6O7Jmp9YHS7hVJUidP5 eaokTWA7JlInUMNN0RhRJJ0ht843qyEz6VryLNQeACvKJN54cV7WZPZa82Bgjr+PVsVg Rsk2ZE1JZGHa0hSdM0wiDgaCC6tm9alfGmR77F63aDIAZf7UtRkeeiHCEwS3CcGwD/R2 KsJC/AHJsu2Jv7jzsUDp0SghysOMbbZvCSpp/liClek2q8bFONghZIhMid/vLXMRI0vO waBA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=WGzF1wIF; 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 X-Forwarded-Encrypted: i=1; AJvYcCWafUYqPAUlpGlQw0q7wObtdsmXVU+suivhHjuBxdv9bCSqp9ADb+wJ8yEA4n9b2uLr89EctPJFUJ1W1RmzQg33f8MWfg/bh3WYB4eMfMITrzAo8a2f74twC3bA0tkl87fDJX/SBvA0fZxj6jTtUsD5jgDD+BIUQhd1JaTdYVrP0lzjMbOSSIqzzUB7Q65/VJIiz2RDZ3DueUOFVlatn9aSl/hYy6FNXElzU5yPAcABrPWknqYZS90Yon7i4DZwdsh7NCpILf7G/sEi4DAJTiDzGH0OtE3t8Izj2QkGph3wkEZR2kiAasnoC56Eybs9BycNI5u+zS3hOvaPrwbKVDLEbj+ZDyQzwEwgcddekfRHzUp1peBuj3jsUOp8lUBlZHqPaeFXVpM1Vjox+flI/yGkYEfV0lRB+g6QSSREOMkjHMBT4e1UaiTZ1wjhai66zPUXeLhvROcujuRpMwq0/zftOi/o7dlDAJZD6FGMYqiDQk6ZKvupAx97Q20RpYSkwpP2TIFw+X55RCETy4eTRN0WyDM/O8VibkEQyh4fYH5HB/wZ96docQB11W1JiLs+kS4ssac6Rt8KDZq2eL2Gf4MzSIpp3Syar5trvjTwklmChgvPuriM1YOaGkJjy1SMCqGWHHNTHRWAbJKLjqSUg5dHaMmcJX1cdfqn7FYazLm97w4lXnUQdx+G/wqhE4croPXZiuZC4pom4Kuv6zVuoXH3+E33Fckh5bCjTOKDkaDqTlNzSqocvWdKPWB1bfLBRZubKYtxQmjbEQpSmeXymRNDV79SSJLtaDUkVCNeZlaSjByt0/xww5/+wQPEeyGRIYQXaeUWYDMZVSfvCfJ4iF3D12F6guxFSpDuiwgB762a2wIR9t+aBC7+YatIDOCeV8fllTp24Q55krJesJY624cRXcAWIUwekrNXArCX2R6k+YsnEVRwd9NYpuE8TaOauk6kZf ptfGURVyrJqX0F+mRr+Hv19gaqmPF0x4130VTQm7+mmgwpay88+VP2AUaRptqWk3Jn6wpaVeFELydRdLiOvs4n2Ax9d9wq+qiX0W88TwTDNANTLEhF0XTMiBfMsCKgE5Q6OZ+e8AUbf40X223XaHk8g2xY0VZ57TmawA/o6YhpKWNXlqlQtmwE2NjCXhhOcCna9c+sF5siu+oFQDpJ5nvnzZDWOuAK5Irs5S119NyzVDb0MM87KD1SyW5tJjqAsOsECS7f+r/S7oZyp8qTcBoA52sSJRIuG/6FnjKPQ8FS/UOIRmC1KFNPTGhsP4mI3ADBqIu1KKk6YV7XOT89QFwrYudenrT0REUT6OzmN0EJUca7bx2h/2ne5zZy7Whz8PeZA4MxHXe0CqHPq+RaHADcbg5mnqCpxIei0yEQtqCm2JDxyTXrtYePgZZ7wyCZ5muomv6yXT+AOSe6qzUJYuoDodjuZEUNKyQGRdYEc6Adu9ETPIrp2f1eptl5cqa3g8Y8/EyGXBuYeTiJ5TOQ0ihBZ3PWdoFQZRy5W46YjYyWgUgQCEfFt3Zk0/8YKRb68TMXjA8evNf1JY8AL2RkdgIe5C4XSS80LIZGDXzBuZpbLAhcpGTpxxWAonBFlfE= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hq32-20020a1709073f2000b00a3bacd5a868si1777511ejc.598.2024.02.13.15.05.45; Tue, 13 Feb 2024 15:05:46 -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=20230601 header.b=WGzF1wIF; 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 8954168D1E8; Wed, 14 Feb 2024 01:05:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2D5268D1CC for ; Wed, 14 Feb 2024 01:04:55 +0200 (EET) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1d72f71f222so38802785ad.1 for ; Tue, 13 Feb 2024 15:04:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707865494; x=1708470294; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WMxXHC1Fwk2B0LVSX41Sv3JWJ2o/ZRRmp9XDyFw8loY=; b=WGzF1wIFBKsCO8qw7jFpMJbWJHs3bN/fIsHWlNrWX4uqe/RRgGTu82PliC+hfcP419 +za5t5/ZyXiSHJq51hQQiYvapAspBbeBMut8uufOuJgkG5Gdfa/n/i+Kdlf+DWHAXizo eOz4Gz08bwiNBdo+cBOmNibgGAh16TZb7b0UIxdXk782SQ4jem3yEw3kP7bWwI1pLS+M 56fs3ZntfKhHfUqqtQxuEr8x/R2h/2K1yNLO/DtvFGjQdci7x1gh/a7PeGtH2Jqxca// eXRnwyGOMCMHdURiHG9EcCYzTM6Yi/prp3SIhdTp0YlYomOzA7YL+u1GddPxqv2Hv9/8 hEeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707865494; x=1708470294; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WMxXHC1Fwk2B0LVSX41Sv3JWJ2o/ZRRmp9XDyFw8loY=; b=c+H1irlTY/m8inj1ObxlBqGBdkFsQQo0JMHxRQa00TJWU/FcZxm1BSLoY+8ppU6X/3 H6nNGavKQPRJBBsPCUClMG3B8UoqK5QwYKHtc1iK54Bw+3ldAyJHoSMe1rZl7gBuflYs SIyJeWGbCsMMpjlbhaCDw0uK+qzBkPjxaxpkzSK9YiCr3KCxV98c9xVYuFeCY6TYOvbc MlZLn6OkArFQeUkXFmp9hQNdIbi0a78/db93LRlUL4Bum2ZzFkekaABZYIoUFuimRJZe pgZZA8q0WC6/Ly2cMPTIgplvYFbpqF/fx2KzsuYYJCVM02D//OSEX/Oa3aYmPGOLtIIh 1poA== X-Gm-Message-State: AOJu0YyAlEouI+pNULHr2iye2QFJYOrpWm+0ICDyO8cDT7phx+IE2U5J 1dVSDwZ2Uf+YeTXV/JCF0zWJt0wka9/EJie0cv+B0gnLUqlCnYFRZZ0rX92R X-Received: by 2002:a17:902:eac4:b0:1db:4b29:9b21 with SMTP id p4-20020a170902eac400b001db4b299b21mr1194615pld.23.1707865494059; Tue, 13 Feb 2024 15:04:54 -0800 (PST) Received: from localhost.localdomain (2a01cb040b6872000000000000000afa.ipv6.abo.wanadoo.fr. [2a01:cb04:b68:7200::afa]) by smtp.gmail.com with ESMTPSA id l13-20020a170903244d00b001da294ff6d5sm2580098pls.189.2024.02.13.15.04.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 15:04:53 -0800 (PST) From: Matthieu Bouron To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Feb 2024 23:50:13 +0100 Message-ID: <20240213230418.457056-6-matthieu.bouron@gmail.com> X-Mailer: git-send-email 2.43.1 In-Reply-To: <20240213230418.457056-1-matthieu.bouron@gmail.com> References: <20240213230418.457056-1-matthieu.bouron@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/7] avutil/jni: remove unnecessary NULL checks before calling DeleteLocalRef() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: CvoYT1QDmDkM Delete{Global,Local}Ref() already handle NULL. --- libavutil/jniutils.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libavutil/jniutils.c b/libavutil/jniutils.c index 89623af3f8..beedf24c0d 100644 --- a/libavutil/jniutils.c +++ b/libavutil/jniutils.c @@ -236,17 +236,9 @@ done: av_free(name); av_free(message); - if (class_class) { - (*env)->DeleteLocalRef(env, class_class); - } - - if (exception_class) { - (*env)->DeleteLocalRef(env, exception_class); - } - - if (string) { - (*env)->DeleteLocalRef(env, string); - } + (*env)->DeleteLocalRef(env, class_class); + (*env)->DeleteLocalRef(env, exception_class); + (*env)->DeleteLocalRef(env, string); return ret; }