From patchwork Tue Aug 16 01:54:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 17131 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 76FDFC3275 for ; Tue, 16 Aug 2022 01:54:37 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0801B61FC5; Tue, 16 Aug 2022 03:54:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1660614877; bh=IkepI4OpLEdCsj0gxeEvWVugmg3kTJKvXZusdraEcb4=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=d143DgPRRDdof+tY9ESvUH/nXkyUHBA98Q8QNdba5lA/afXv9beaoHLrgYwLSXQwT treFykTd+vBue2l+0KBeXWVbA1adOt4cXlufxUgI/SF0GDyKrvWwYUDyVwMi3wrUgx W2wo3/1m+X3peRVIL2kH5b2cSUSPkAB2Nsk/vsbKld7OZ2qYfMHopvdHgglDRPlHBn d2OGil1V6lMR4Uq8jiX42rWgg1HHtMB8ueUjgYJ86EFm67iddLM8M6f56lj6HGxDja paptPNWP14BcjONoJ/iigxTj2oRdLDoD56icd5jse5V7JhvoniudcwgofZ7KcRAPNW IjqgtipCgWy7Q== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id F404861FBD for ; Tue, 16 Aug 2022 03:54:33 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="ae3M7qwl"; dkim-atps=neutral Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 912D251C; Tue, 16 Aug 2022 03:54:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1660614873; bh=IkepI4OpLEdCsj0gxeEvWVugmg3kTJKvXZusdraEcb4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ae3M7qwlVOQ1L/hVEqdbFTQ+vyhdPOyJJn0hTZJ/FxxHckiYkPpi8b4ux0kFYzPC+ Z/ECz8vAJGMxJ02cmshvUwcF5hVyeV8FepXE79Ka+MS805b2bsFxQKCMBQoxoRN3RT mCMcF/0D1ssZ5fNnQbNyzXBOs/wxNZyzJBoIFfm0= To: libcamera-devel@lists.libcamera.org Date: Tue, 16 Aug 2022 04:54:09 +0300 Message-Id: <20220816015414.7462-5-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220816015414.7462-1-laurent.pinchart@ideasonboard.com> References: <20220816015414.7462-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 4/9] libcamera: yaml_parser: Fix bounds checking for 16-bit YamlObject::get() X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The YamlObject::get() function specializations for 16-bit integers cast the return value of strto(u)l() to a 16-bit integer, rendering the bounds checking useless. Fix them. Fixes: c7d260c03abd ("libcamera: yaml_parser: Add get() specializations for 16-bit integers") Signed-off-by: Laurent Pinchart Reviewed-by: Paul Elder Reviewed-by: Jacopo Mondi --- src/libcamera/yaml_parser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libcamera/yaml_parser.cpp b/src/libcamera/yaml_parser.cpp index 9162e2250ed4..f928b7238a19 100644 --- a/src/libcamera/yaml_parser.cpp +++ b/src/libcamera/yaml_parser.cpp @@ -143,7 +143,7 @@ std::optional YamlObject::get() const char *end; errno = 0; - int16_t value = std::strtol(value_.c_str(), &end, 10); + long value = std::strtol(value_.c_str(), &end, 10); if ('\0' != *end || errno == ERANGE || value < std::numeric_limits::min() || @@ -176,7 +176,7 @@ std::optional YamlObject::get() const char *end; errno = 0; - uint16_t value = std::strtoul(value_.c_str(), &end, 10); + unsigned long value = std::strtoul(value_.c_str(), &end, 10); if ('\0' != *end || errno == ERANGE || value < std::numeric_limits::min() ||