From patchwork Wed Feb 12 20:16:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Schwartz X-Patchwork-Id: 1513 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id EDC6B1703492A for ; Wed, 12 Feb 2020 20:17:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.3 (2019-12-06) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=ham autolearn_force=no version=3.4.3 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Wed, 12 Feb 2020 20:17:34 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 9FDB818E91EC5B; Wed, 12 Feb 2020 20:17:10 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: luna) by orion.archlinux.org (Postfix) with ESMTPSA id 238C118E91EC20; Wed, 12 Feb 2020 20:17:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1581538625; bh=UCvK4HKDpcWqlKCC8W7J5Ek4JNkp/ZXgf+u9xARwASw=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=UBh2aCsh8LNtcVUsD/uwbxZHf0YoBQwMnrgHTqkuTPMDk3L4BwY16OJyd7uRI6+1m BlVwtId2pT7vxjyfktIrZWLTkWq+XTmTCd7TnzFPs++fWY5uMvd6J3vO1l/U3iSKAf qErFUqfw4K0zLQWcaMYKlTQRY33GLVsoA2nE1SvGJpj166htlgUIZLtsZoXWo4wnWO Hjdzj+cgF5BCvRFkp+hqyDFwwSkxM5t3BR9nFrbOw4rZFyZWxAwVX5koBoGbNOORS1 bmg88Qvns1TD+7lzfuRF8yPxUB4o9fgkNNHre2r+AdIEoi3QvbuhCVQICSVO5lmjzv ComrPUKITOoI2g6uVI0Th3jZJwZ9m7XTDiugtY1dAWqYCG3c6NGGAt4HA5iOU8Mzyd kfT0x4BRUOPoV1h6jUjFiGyY1spwSjnM0oA4XYIH9TtKWaJNEXqz5d08PK+wCQJGno 3f2jrupg8CGPvk7RhFezIPllu7wiBV/vLS1QLGWcRc1Vge3uT61p1vwJOlm5DmukhI LsQQ5C1Nz0eZqi/HtWvIzSFf8PrIePGORPFr6mbPTR35M1zjp/xY4YegydJEVL0Mg7 IlV8qrU8f746naY5NoG7nrUOW9ldo6V1WCkJyWdJfvlOfJx0cASF47i75DC6D+GWKe 0yixCDBTcw0YNIxfZIGQEc1k= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id CDDB729D04; Wed, 12 Feb 2020 20:17:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1581538624; bh=UCvK4HKDpcWqlKCC8W7J5Ek4JNkp/ZXgf+u9xARwASw=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=mpMVTWRKzGySh08YVCLKVqy6kaZsBuw7T13GtnSieoCj1AxpSNPt6UojO4JbNwld0 K565OsZaYPKJ/2qsh66E1+s+n2X3gyfmK42QUxJXvbjlPBvAykc34OgCu0xPb+Rycx LSEX2vJK9lka4O3uyWmFGWhIW5xxcRCIbWPSRC4xosZe/i8HLcz/ZadiC7ncIFBCbd OSLgrWecBeAt2Vb2k/5ykEM3VJ21ToYJGHC31RX+khASiFlfmgAHk+6ZCEfn3yvT9+ QZMuGSOKW/H5RnujcrjvbF3nfcdXKzLJ5+47gmN1jWv3PpuiFvUQEnRiU/SBDXVRfr 2L1FNvWXGrEsfYzMQzbCKhhQSSKoBwkDb8MK4279JmS06wwUvO4UR6J5hOjd4czwFg IDBsa88Hjd0h39pogBlLcuZdSxGmAeBUjd+Xc3ZsVeK+if/PZ4cIUnRewDSKw2sgu+ WuhPmAhIEX/Yc4KMUHLOM5r5O1Zwdp0hqsINmd7y7py4UxaDpSN5sXiblh/UJNH9+o UaVnNebi+kh6ACXNoaXfjOieHkIeaCWqEe+ZUDzbc2gJMReKM6/2Etna5r6lEri1Q0 AlMVxhVej7cRuRbZiEZ/BNtDCzCgFagxUMU0wtGhc2EjN3+4zdGl/jtvxTPZ5qUfEY mjfp+CL3BperdPXaZ0vz1THE= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id A1D7329D06 for ; Wed, 12 Feb 2020 20:17:02 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Wed, 12 Feb 2020 20:17:02 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 8B75318E91EC02; Wed, 12 Feb 2020 20:16:59 +0000 (UTC) Received: from didactylos.attlocal.net (unknown [IPv6:2600:1700:57f0:ca20:763a:c795:fcf6:91ea]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: eschwartz) by orion.archlinux.org (Postfix) with ESMTPSA id E932E18E91EC01; Wed, 12 Feb 2020 20:16:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1581538619; bh=UCvK4HKDpcWqlKCC8W7J5Ek4JNkp/ZXgf+u9xARwASw=; h=From:To:Subject:Date:In-Reply-To:References; b=uP9wfVV/GYv+P2Z1JRaspNvM40l1DmOIaqfcVJ1e5clU/c9yhd9Abfc4u+s5L9C5K x0SVj8E3LjE1KJ5IFUZomu11Iw0TNz4J4mjiWlws1b2wa2S1Gg1JW1vNAbOSTwU+XQ eAUVQGiD+LajAS9gD/Q+JUYCaylLTjTJc36NfCRueE2UEQLYb+8Yw8cFu44qyIC7s7 i3JX4rusNhC+hTcidT0WW7Ny4ZV9vrlSBFcJ5zAqIpP9yRNWn/Mztzd4Y02sWJVAEl +8A5xSVGm5zY7ZreCRdFx7K5yJ5IBiEBpfW9Pll7FqRacjxlu8CLOjZIObSAptnV0O D07fmhHvxgfm0nwbZqijiENJ+2VCPrn7i0/DicuJ9E7LT21aXRezU/RVYgwsHj+6xD Nbb/pqrop7U7xrUrZeFkUBJ1OOhIAS+wYg0ESkUF6tuut2kT+61X3dS9T2x+dCPISA d3lRy07RZCvjMy00oNinnzbLeeUwlqNM/em0VGmCWe5XT93cULG/MH/do3GIQLLaNs s2VHgvlS37lfDLsEsPOMH7pye8QnqmSmHMI293mojSmup8q6wt+R0XStUsMuXYFNc7 rW9DTBJyHKTO73HjgPD0PDZ2vW7RJcLWBNOhDr9YbJPOP6vOiR/XFr3JdKxZQJMYF5 RdIqKSaGSrg0QPFKJECinIfc= From: Eli Schwartz To: aur-dev@archlinux.org Subject: [aur-dev][PATCH 1/2] fix php 7.4 warnings Date: Wed, 12 Feb 2020 15:16:37 -0500 Message-Id: <20200212201638.3051647-2-eschwartz@archlinux.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200212201638.3051647-1-eschwartz@archlinux.org> References: <20200212201638.3051647-1-eschwartz@archlinux.org> MIME-Version: 1.0 X-BeenThere: aur-dev@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Arch User Repository \(AUR\) Development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: aur-dev-bounces@archlinux.org Sender: "aur-dev" If a db query returned NULL instead of an array, then accessing $row[0] now throws a warning. The undocumented behavior of evaluating to NULL is maintained, and we want to return NULL anyway, so add a check for the value and fall back on the default function return type. Signed-off-by: Eli Schwartz --- web/lib/aur.inc.php | 28 +++++++++++++++++++++------- web/lib/pkgfuncs.inc.php | 4 +++- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index e9530fc0..dbcc23a4 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -197,7 +197,9 @@ function username_from_id($id) { } $row = $result->fetch(PDO::FETCH_NUM); - return $row[0]; + if ($row) { + return $row[0]; + } } /** @@ -222,7 +224,9 @@ function username_from_sid($sid="") { } $row = $result->fetch(PDO::FETCH_NUM); - return $row[0]; + if ($row) { + return $row[0]; + } } /** @@ -339,7 +343,9 @@ function email_from_sid($sid="") { } $row = $result->fetch(PDO::FETCH_NUM); - return $row[0]; + if ($row) { + return $row[0]; + } } /** @@ -365,7 +371,9 @@ function account_from_sid($sid="") { } $row = $result->fetch(PDO::FETCH_NUM); - return $row[0]; + if ($row) { + return $row[0]; + } } /** @@ -390,7 +398,9 @@ function uid_from_sid($sid="") { } $row = $result->fetch(PDO::FETCH_NUM); - return $row[0]; + if ($row) { + return $row[0]; + } } /** @@ -512,7 +522,9 @@ function uid_from_username($username) { } $row = $result->fetch(PDO::FETCH_NUM); - return $row[0]; + if ($row) { + return $row[0]; + } } /** @@ -546,7 +558,9 @@ function uid_from_email($email) { } $row = $result->fetch(PDO::FETCH_NUM); - return $row[0]; + if ($row) { + return $row[0]; + } } /** diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index a4cd17ac..8c915711 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -147,7 +147,9 @@ function pkg_from_name($name="") { return; } $row = $result->fetch(PDO::FETCH_NUM); - return $row[0]; + if ($row) { + return $row[0]; + } } /**