From patchwork Wed Dec 21 17:38:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 18043 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 43271C3200 for ; Wed, 21 Dec 2022 17:38:59 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 91674633AC; Wed, 21 Dec 2022 18:38:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1671644338; bh=DK7w0U+it7/g4751mM2UxK/8nzvs5hfzd7zYdT9I9Qk=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=25hB6TcovNwCQaM2FsdbgbpHHyYzIRhRiG4y+pI4rI6UZMXQJUqaPZ9Xxw/8zne1S R59sP6sjW+KCtOaYV2HiJ8XMWtEBdnjIXIHYm+nyA+yysEFghpUc+vJf2YPMB7Z42u e2JO3FNme8zP52ZKvd8PJYIyJCztZ7mzga9Ft+OlGF/vJUXABOucQZ9y8dqV7x6QNZ YJNNacim0/3eUHxCYteEeXl1ADUNN/4jAav0uc3Te6Ih5O2wAQws2oNWrnzrGxVXQj +VIrDSC7g7EWoWwOY0vX2RyNI+VI9zgj6zkSv3v46nf/7cSuJzrXy1KtXtSEdMateq QyCQ77P9COpSg== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DA38761F15 for ; Wed, 21 Dec 2022 18:38:56 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="NKu77dmf"; dkim-atps=neutral Received: from Monstersaurus.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 25E1CFB; Wed, 21 Dec 2022 18:38:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1671644336; bh=DK7w0U+it7/g4751mM2UxK/8nzvs5hfzd7zYdT9I9Qk=; h=From:To:Cc:Subject:Date:From; b=NKu77dmfjrNh92GDgl/Gov3GPPEFWBebmMK50CouO30hmSLVnWS1GdVuQMJYibgvQ h78Zss8S99FP76wVb9FtvyY0JJCnZR0i46LFbNLUBzVi0iiePzNrtg01j4NHBpgnU4 TwUNyhE/JjNsssONL0t5GlibsVGO8th3qSxFS3tg= To: libcamera devel Date: Wed, 21 Dec 2022 17:38:47 +0000 Message-Id: <20221221173847.73663-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: yaml_parser: Use C locale 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: Kieran Bingham via libcamera-devel From: Kieran Bingham Reply-To: Kieran Bingham Cc: Hannes Winkler Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" When parsing configuration files on systems with differing locales, the use of strtod can produce different results, or in the worst case - fail to parse expected values. Provide an RAII implementation to construct a locale specific to the expected mappings for configuration files provided by libcamera. Bug: https://bugs.libcamera.org/show_bug.cgi?id=174 Bug: https://github.com/raspberrypi/libcamera/issues/29 Reported-by: https://github.com/kralo Reported-by: Hannes Winkler Signed-off-by: Kieran Bingham --- src/libcamera/yaml_parser.cpp | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/src/libcamera/yaml_parser.cpp b/src/libcamera/yaml_parser.cpp index d8a7c2f9250f..8ddc6d6b5fd5 100644 --- a/src/libcamera/yaml_parser.cpp +++ b/src/libcamera/yaml_parser.cpp @@ -31,6 +31,36 @@ namespace { /* Empty static YamlObject as a safe result for invalid operations */ static const YamlObject empty; +/* + * Construct a global RAII locale for use by all YAML parser instances to + * ensure consistency when parsing configuration files and types regardless of + * the host Locale configuration. + * + * For more information see: + * - https://bugs.libcamera.org/show_bug.cgi?id=174 + */ +class Locale +{ +public: + Locale(std::string locale) + { + locale_ = newlocale(LC_ALL_MASK, locale.c_str(), (locale_t)0); + if (locale_ == (locale_t)0) + LOG(YamlParser, Fatal) + << "Failed to construct a locale"; + } + ~Locale() + { + freelocale(locale_); + } + locale_t locale() { return locale_; } + +private: + locale_t locale_; +}; + +static Locale yamlLocale("C"); + } /* namespace */ /** @@ -283,7 +313,7 @@ std::optional YamlObject::get() const char *end; errno = 0; - double value = std::strtod(value_.c_str(), &end); + double value = strtod_l(value_.c_str(), &end, yamlLocale.locale()); if ('\0' != *end || errno == ERANGE) return std::nullopt;