Message ID | 20170418065254.8200-3-lfleischer@archlinux.org |
---|---|
State | Accepted, archived |
Headers | show
Return-Path: <aur-dev-bounces@archlinux.org> Delivered-To: patchwork@archlinux.org Received: from nymeria.archlinux.org by nymeria.archlinux.org (Dovecot) with LMTP id YdLyAtO39VhMDgAAtiB/HQ for <patchwork@archlinux.org>; Tue, 18 Apr 2017 08:53:07 +0200 Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id D5D5E4033A; Tue, 18 Apr 2017 08:53:05 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on nymeria.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-4.3 required=2.5 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS; Tue, 18 Apr 2017 08:53:05 +0200 (CEST) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id A76D72C352; Tue, 18 Apr 2017 06:53:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1492498382; bh=ZUEsqz8apN2yuTWwHZWQDO9zX6uqkbV0kjToq1RaCX0=; h=From:To:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Reply-To; b=uXIPfIqglJd0y/oLEl+ElGej7SL3Vu5XDFS6RwdidgvT5jUTAiSMPOEw+4PUVGZEn 1l3yBDTe+cNQmWtq0sKfeVO01xzvWtY3lfq7gqbjBLPeibDEIhXlk1YaQOht0NdGvP u8dEFNrjUilKzoKjofCOxPoOVTpuOsUtBrhzl8xuh4xgzy/2iszBh6ZOXiVRUM+dfv jREKIrNywUUltBQE8IdWg3W0QG+aYSIcx/AuTzvjI2/Wf9OOUT/kBnMAIhGk9pRp27 cWSzeliUXbr3TEkx7izPsh/vbGrNX1wmWm5DBf95LQj2p/ld90Ppz026NDtwBCyMLv U/hoJPB9CxV4UIe0hb6Quxrjn81D6cEXg/1TBer5TNVUzTx6x3kgNhpMAbvsf8kmqI Xuvy2VfiNnZlwNTQYw4qyTlgzLynSZWtoIG4bt1k1aNxogTGHFciPT1k0ZSOPxuBNJ kqmVfzYgdj3UgQFcapxOTKROVbIj58tBj7mOR+nxQ7arrpvzDgrOwi9XNM0kt80Skm Z0QX10ZUO6d0eBfK11XjADOxFqXRqf2uE4q1TiaZChmtXA2mvTMNmbvlIa38PJy7DP bCWrhAjczpBBk3Z5BlSzRtzbhnxIWo9EIUSyYP9yRFioiMFHbJRYx40MctKiXsMsHJ K9BXCTlvwilfxbDIswsygRIY= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id B4F562C2CD for <aur-dev@lists.archlinux.org>; Tue, 18 Apr 2017 06:52:58 +0000 (UTC) Received: from nymeria.archlinux.org (nymeria.archlinux.org [89.238.67.251]) by luna.archlinux.org (Postfix) with ESMTPS for <aur-dev@lists.archlinux.org>; Tue, 18 Apr 2017 06:52:58 +0000 (UTC) Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id 74BBE403F1 for <aur-dev@lists.archlinux.org>; Tue, 18 Apr 2017 08:52:57 +0200 (CEST) Received: from localhost (s-8d3a264e.on.site.uni-stuttgart.de [141.58.38.78]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lfleischer) by nymeria.archlinux.org (Postfix) with ESMTPSA id 396AA403C3 for <aur-dev@archlinux.org>; Tue, 18 Apr 2017 08:52:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=nymeria2; t=1492498377; bh=ZUEsqz8apN2yuTWwHZWQDO9zX6uqkbV0kjToq1RaCX0=; h=From:To:Subject:Date:In-Reply-To:References; b=S9dqEP5L+3NV1v3f92GKSNtdHgEIzU8ypuG68Q8ITsi1qk9suJBKV3fAbejBuopQA MU306nUX8Lhjpr/qMX+rZQh80sJ9Bopvgy3+BLI1gntscZ0Qz96KVvz0kMIlPrnJzA FdNdN/Q40fqnmvrhnXJEcUYSu/5RQzXdoHI51VUvmtzPhmUTj8yq/zbGtI6D3CfUS8 2JW1R2znZWNMAiyTUPa50+j84vb6ThIeWhxZQjNHePa2/tupDl1IKpvd5xlJcBREUE QUvep4OyARaj10bSWZfnBOrZwTKHsADvHoCs8SU3XChh+fOImzAiLdM/EA72AAeqpZ FtDq5RxXVMtfck8NrUR/Rk4C3bfIXGFay6wVrprvfCC3T0+L/cGkkc6od7QcON7WaQ lPHIlKOurCtK128Yay+awYoQh7Z7wg9qM2T+omk8v84pZzhfUs5jLlRwsAl1pYbBOr IsEC5rQoZ7Q08RaZi/hu4NQge+5zIOvRdZHwwxef24ncWN9vo+vE+K9TDEGHos8Ryl bUZwVdC5WkP8zKrzjMYCNb7f+yFFUGiLd4/orWXz4YEHQb8UUzr75BIXCTw8PpfMKN sG1G7q/2wZppvEzYH0QI2M2UlXKF1gdzP4NUdbmoi3nos1PGmJj2K2AIqJmktW5yZh 5qkM88X0hOqjXkillOfda/lk= From: Lukas Fleischer <lfleischer@archlinux.org> To: aur-dev@archlinux.org Date: Tue, 18 Apr 2017 08:52:53 +0200 Message-Id: <20170418065254.8200-3-lfleischer@archlinux.org> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170418065254.8200-1-lfleischer@archlinux.org> References: <20170418065254.8200-1-lfleischer@archlinux.org> Subject: [aur-dev] [PATCH 3/4] Check query return value in db_cache_value() X-BeenThere: aur-dev@archlinux.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Arch User Repository \(AUR\) Development" <aur-dev.archlinux.org> List-Unsubscribe: <https://lists.archlinux.org/options/aur-dev>, <mailto:aur-dev-request@archlinux.org?subject=unsubscribe> List-Archive: <https://lists.archlinux.org/pipermail/aur-dev/> List-Post: <mailto:aur-dev@archlinux.org> List-Help: <mailto:aur-dev-request@archlinux.org?subject=help> List-Subscribe: <https://lists.archlinux.org/listinfo/aur-dev>, <mailto:aur-dev-request@archlinux.org?subject=subscribe> Reply-To: "Arch User Repository \(AUR\) Development" <aur-dev@archlinux.org> Errors-To: aur-dev-bounces@archlinux.org Sender: "aur-dev" <aur-dev-bounces@archlinux.org> X-UID: 311 Status: X-Keywords: Content-Length: 735 |
Series |
[1/4] Check query return value in pkgbase_user_notify()
|
expand
|
diff --git a/web/lib/cachefuncs.inc.php b/web/lib/cachefuncs.inc.php index d558be4..faeae5a 100644 --- a/web/lib/cachefuncs.inc.php +++ b/web/lib/cachefuncs.inc.php @@ -73,6 +73,9 @@ function db_cache_value($dbq, $key, $ttl=600) { $value = get_cache_value($key, $status); if (!$status) { $result = $dbh->query($dbq); + if (!$result) { + return false; + } $row = $result->fetch(PDO::FETCH_NUM); $value = $row[0]; set_cache_value($key, $value, $ttl);
Instead of unconditionally calling fetch on the return value of query(), error out early if the value evaluates to false. Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org> --- web/lib/cachefuncs.inc.php | 3 +++ 1 file changed, 3 insertions(+)