{"id":20651,"url":"https://patchwork.libcamera.org/api/1.1/patches/20651/?format=json","web_url":"https://patchwork.libcamera.org/patch/20651/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20240712052920.33396-4-umang.jain@ideasonboard.com>","date":"2024-07-12T05:29:17","name":"[RFC,3/6] libcamera: yaml_parser: Increase sentinel to 100k","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"e031ac6e1cdc0a9eab969394ee48842347c3a6fb","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/1.1/people/86/?format=json","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/20651/mbox/","series":[{"id":4451,"url":"https://patchwork.libcamera.org/api/1.1/series/4451/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4451","date":"2024-07-12T05:29:14","name":"converter_dw100: Add vertex map support","version":1,"mbox":"https://patchwork.libcamera.org/series/4451/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/20651/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20651/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 5EF16BDB1C\n\tfor ;\n\tFri, 12 Jul 2024 05:29:46 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E3F046337A;\n\tFri, 12 Jul 2024 07:29:44 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 81B3C6336E\n\tfor ;\n\tFri, 12 Jul 2024 07:29:36 +0200 (CEST)","from localhost.localdomain (unknown\n\t[IPv6:2405:201:2015:f873:55f8:639e:8e9f:12ec])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6C3BAD50;\n\tFri, 12 Jul 2024 07:29:01 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"J2sYmYg/\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1720762142;\n\tbh=qMn3R1HdkGQNP0A9FbcXQQtgNYGG5yOo3ZcJfdSZ0jw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=J2sYmYg/qIT9NetQ1hMTFoGT/BHopoH881jCO/++O1r7yk6ccae0kxV1pkIWthM/W\n\tpDLkXP60M8A3f2doSDaxBpqPDOiA4Y7IDi612iiGZ205tdWolxN3WYYXlMy0ICsVgY\n\tMwNDuw7EzMCcbymWr+e7SxVVcQTKJTHnMdhlIUTk=","From":"Umang Jain ","To":"libcamera-devel@lists.libcamera.org","Cc":"Xavier Roumegue ,\n\tUmang Jain ","Subject":"[RFC PATCH 3/6] libcamera: yaml_parser: Increase sentinel to 100k","Date":"Fri, 12 Jul 2024 10:59:17 +0530","Message-ID":"<20240712052920.33396-4-umang.jain@ideasonboard.com>","X-Mailer":"git-send-email 2.45.0","In-Reply-To":"<20240712052920.33396-1-umang.jain@ideasonboard.com>","References":"<20240712052920.33396-1-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Xavier Roumegue \n\nInstead of manually increasing the limit, prepare a constexpr\nfor maximum sentinel and use that instead.\n\nSigned-off-by: Xavier Roumegue \nSigned-off-by: Umang Jain \n---\n src/libcamera/yaml_parser.cpp | 9 ++++++---\n 1 file changed, 6 insertions(+), 3 deletions(-)","diff":"diff --git a/src/libcamera/yaml_parser.cpp b/src/libcamera/yaml_parser.cpp\nindex 025006bc..09ed75f1 100644\n--- a/src/libcamera/yaml_parser.cpp\n+++ b/src/libcamera/yaml_parser.cpp\n@@ -690,6 +690,8 @@ void YamlParserContext::readValue(std::string &value, EventPtr event)\n int YamlParserContext::parseDictionaryOrList(YamlObject::Type type,\n \t\t\t\t\t const std::function &parseItem)\n {\n+\tconstexpr unsigned int maxSentinel = 100000;\n+\n \tyaml_event_type_t endEventType = YAML_SEQUENCE_END_EVENT;\n \tif (type == YamlObject::Type::Dictionary)\n \t\tendEventType = YAML_MAPPING_END_EVENT;\n@@ -698,7 +700,7 @@ int YamlParserContext::parseDictionaryOrList(YamlObject::Type type,\n \t * Add a safety counter to make sure we don't loop indefinitely in case\n \t * the YAML file is malformed.\n \t */\n-\tfor (unsigned int sentinel = 2000; sentinel; sentinel--) {\n+\tfor (unsigned int sentinel = maxSentinel; sentinel; sentinel--) {\n \t\tauto evt = nextEvent();\n \t\tif (!evt)\n \t\t\treturn -EINVAL;\n@@ -711,8 +713,9 @@ int YamlParserContext::parseDictionaryOrList(YamlObject::Type type,\n \t\t\treturn ret;\n \t}\n \n-\tLOG(YamlParser, Error) << \"The YAML file contains a List or Dictionary\"\n-\t\t\t\t \" whose size exceeds the parser's limit (1000)\";\n+\tLOG(YamlParser, Error)\n+\t\t<< \"The YAML file contains a List or Dictionary whose size exceeds\"\n+\t\t<< \" the parser's limit (\" << maxSentinel << \")\";\n \n \treturn -EINVAL;\n }\n","prefixes":["RFC","3/6"]}