From patchwork Tue Feb 27 14:50:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Bouron X-Patchwork-Id: 46574 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51b:b0:19e:cdac:8cce with SMTP id gm27csp2043866pzb; Tue, 27 Feb 2024 06:56:40 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXNM4ehGdwvKqjKw9L0E/jD7vDfMhDIGoboYUnKByAci8AllEo8+BcOS+kPMBHqQnLWnx6vHqmUYIzdPOxl54ZsNg/EzwbCgIsTUw== X-Google-Smtp-Source: AGHT+IEkcREb1mPecdszbwzmQeH7thFDcLttQDKhoTCxiQIeVEsEqdYqwryh/11GaG7pj3FEuTzZ X-Received: by 2002:ac2:4288:0:b0:512:fdb3:7a9e with SMTP id m8-20020ac24288000000b00512fdb37a9emr3339445lfh.31.1709045800428; Tue, 27 Feb 2024 06:56:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709045800; cv=none; d=google.com; s=arc-20160816; b=juk1uwiEdihvGvouq3sqqGwM3kzjeAf1cY8iE2sxaZo2tsjRvEEYIcvqxambrcEXDR 2S/w9QeYWWSRtQ5pc0iphUircNveQo1kfDyUXWI3HbjouKBYUSYrNuFXO0WMYATREMsX op/urNxQnuv4eQ4SiK7NieWxP7tnsZDHLRzOAGJCVYZDUckpRlhi+084eikq1SEUUsr9 ILJXTlUY7docEHiTCfohh7sS93Zb0W37xUE612zVJKSQSJUlF2J45Zppa41WxvNTA6a4 d3+xefRfhoPs0d7ZG1dfNrRVDC2QfXhml2YcmYQA1Ss0KkJDU4eKubutZBU39hAjwuQw MUbQ== 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=2dGDrc6vG7DwqggBfFEip2R13BaqMcwLkSoSrpPl1ns=; fh=bsOL+ub9JEnfNazRgCdgjxJAChubFVskZxBzYcxeDLU=; b=a5+bbRfkk1ZlaMnGPvMNf6jXd2V+yrSaK72oBRlNT9O2rqF0gqZjwPKwjgoqbsmzDS EQBL/tSSaq6mb54ZvywFatLKyivaMkQL/Dr2hsNCpaWI99MEKdavQpHnu8wUMNgJMsZT rGTgcf67JB8uJs+jY/ywRuyFFFtaxK73fWcpFY2vCPu3YHifQnkYSMbGTLmyTZURDzTI ClXndFpNDLYTGvdGavK/oVSTmMfjZIu4doXo75sXMcBOEmtU/ludxZoXodRHEP/+pYeZ 7TJb91bjMm1W6b/moj7fIxIoXzFLl+b0BxZNWWj/59U5LwZ09fBAe+XerN/eKdQh7O0p ig+w==; 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=dpqCOYm7; 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 v16-20020a056402185000b005664810cae5si330244edy.39.2024.02.27.06.56.40; Tue, 27 Feb 2024 06:56:40 -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=dpqCOYm7; 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 5F67368CC91; Tue, 27 Feb 2024 16:56:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED1C968CAA9 for ; Tue, 27 Feb 2024 16:55:59 +0200 (EET) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-33d568fbf62so2478446f8f.3 for ; Tue, 27 Feb 2024 06:55:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709045759; x=1709650559; 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=lPYRLaemd/5JXt7wVTMSEuFYjpCq9JVN5Mxm5L8PxrM=; b=dpqCOYm7Q/0DNfZDqn+D6e14/00C5OetNaav6gPJe1xh38nT/U3HghRsCq3sVK2f0N cjYImLwMEhY5OMPmG9dOqe0iLO/g0fFPTB5LuediEiCPB34EsN7gWylSmv/Ajps+NExc VpmkvxA94Xjl4ZU0A7VG08tBkaxu0em0zYO/rvhXRVAqdkvy9syeKk3PSXuY7L1L6hZW s0pKDPSCWgfELjBzAVDdkBhiaQenHBBPuU88fuSIaPUTJc6ihTtbZ5EhSaUAkHXyRvzK OzVpC1+w/uptH98z4iGif7Mrd18iMhlX1IgYgqaqeQJyM/FgE1Uz9Zst1i8mKbX6/CrR TIlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709045759; x=1709650559; 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=lPYRLaemd/5JXt7wVTMSEuFYjpCq9JVN5Mxm5L8PxrM=; b=SeO2S0BJSaJJC6yjQ9LZJpDSvRTiWsYRFE/9I/bg6uir0TEIDBxdDPPWkYh32A+BR7 zH5QJ/x7GOOfIN7Ekua+VQPFmmkD418/hZyzavRjwhhk8Fyj4m7t0owr9MA2e/5vYUpx JyXbr1rlbP0JrqzS9sw20885NM/qG71QLP2RqyKOv+aZNgH0b5aWjT4Tim6/q4FdLB1z sQYRiFFZ3ITsGARkxKJsvd6pV351YCQ+9RgssP/LxLWbawyckFoBz4nWUhjjEZRBf/Ls AbCZoAlTqcPgXE6V7w5zg8jQXQSdh7t8ETKsZEVqndNunU3urfDO2ByU8P8zEMqrnZXr +fyA== X-Gm-Message-State: AOJu0YwanTyhx/1BdqUevH6PcX21Q/hwuXEt6te0xVnig5cLrkmMfe9f LC/OzsZJR2Cs/BCj7WZomeiYWC98xfrhS4qwXQUeh+PBgJ/6A7CldhB1TORW X-Received: by 2002:adf:e689:0:b0:33d:afbc:6c85 with SMTP id r9-20020adfe689000000b0033dafbc6c85mr8125779wrm.8.1709045759191; Tue, 27 Feb 2024 06:55:59 -0800 (PST) Received: from localhost.localdomain (2a01cb040b6872000000000000000afa.ipv6.abo.wanadoo.fr. [2a01:cb04:b68:7200::afa]) by smtp.gmail.com with ESMTPSA id o9-20020a5d4a89000000b0033df1dc39f0sm1859627wrq.4.2024.02.27.06.55.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 06:55:58 -0800 (PST) From: Matthieu Bouron To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Feb 2024 15:50:40 +0100 Message-ID: <20240227145536.281991-5-matthieu.bouron@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227145536.281991-1-matthieu.bouron@gmail.com> References: <20240213230418.457056-1-matthieu.bouron@gmail.com> <20240227145536.281991-1-matthieu.bouron@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/6] 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: djuIwvp8siBT Delete{Global,Local}Ref() already handle NULL. --- libavcodec/ffjni.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libavcodec/ffjni.c b/libavcodec/ffjni.c index e3cf24d3e2..69d9a9faa3 100644 --- a/libavcodec/ffjni.c +++ b/libavcodec/ffjni.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; }