{"id":2299,"url":"https://patchwork.libcamera.org/api/1.1/patches/2299/?format=json","web_url":"https://patchwork.libcamera.org/patch/2299/","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":"<20191108205409.18845-4-laurent.pinchart@ideasonboard.com>","date":"2019-11-08T20:53:48","name":"[libcamera-devel,v2,03/24] libcamera: controls: Avoid exception in ControlList count() and find()","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"e1a136adf28cd7d92f088d84de77fc0a6cdeb430","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":{"id":14,"url":"https://patchwork.libcamera.org/api/1.1/users/14/?format=json","username":"pinchartl","first_name":"Laurent","last_name":"Pinchart","email":"laurent.pinchart@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/2299/mbox/","series":[{"id":568,"url":"https://patchwork.libcamera.org/api/1.1/series/568/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=568","date":"2019-11-08T20:53:45","name":"Control serialization and IPA C API","version":2,"mbox":"https://patchwork.libcamera.org/series/568/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2299/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2299/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7BADD6150A\n\tfor ;\n\tFri, 8 Nov 2019 21:54:23 +0100 (CET)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1FFCE31D\n\tfor ;\n\tFri, 8 Nov 2019 21:54:23 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1573246463;\n\tbh=Wb7kncZOf6ol9m4hG99xyRfJ9ENctf05jp1fANDSsJg=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=iIdTUm1BA6tRxqXu5ptOVgJJsS6bXwUPgrA8qyDZsoBnNeWP55rDvEkHQm8tUSv8o\n\tixPUhZU8bMvMPPtvMXEArFJ7oGR+6DKxBZan+0V2uimIiyyv7cfmk79VTMHx1Nx6YF\n\t0n/xPqRUrRcdN/Y282BBx90WhV2DiYNL2VTbE/gc=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 8 Nov 2019 22:53:48 +0200","Message-Id":"<20191108205409.18845-4-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.23.0","In-Reply-To":"<20191108205409.18845-1-laurent.pinchart@ideasonboard.com>","References":"<20191108205409.18845-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 03/24] libcamera: controls: Avoid\n\texception in ControlList count() and find()","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","X-List-Received-Date":"Fri, 08 Nov 2019 20:54:23 -0000"},"content":"The ControlList count() and find() methods use at() to lookup the\ncontrol numerical ID in the idmap_. This causes an exception to be\nthrown if the ID doesn't exist in the map. Fix it by using the find()\nmethod instead.\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/controls.cpp | 18 +++++++++++++++---\n 1 file changed, 15 insertions(+), 3 deletions(-)","diff":"diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex 93ad2fc6a276..0c7cd449ad64 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -491,7 +491,11 @@ const ControlInfoMap::mapped_type &ControlInfoMap::at(unsigned int id) const\n */\n ControlInfoMap::size_type ControlInfoMap::count(unsigned int id) const\n {\n-\treturn count(idmap_.at(id));\n+\tauto iter = idmap_.find(id);\n+\tif (iter == idmap_.end())\n+\t\treturn 0;\n+\n+\treturn count(iter->second);\n }\n \n /**\n@@ -502,7 +506,11 @@ ControlInfoMap::size_type ControlInfoMap::count(unsigned int id) const\n */\n ControlInfoMap::iterator ControlInfoMap::find(unsigned int id)\n {\n-\treturn find(idmap_.at(id));\n+\tauto iter = idmap_.find(id);\n+\tif (iter == idmap_.end())\n+\t\treturn end();\n+\n+\treturn find(iter->second);\n }\n \n /**\n@@ -513,7 +521,11 @@ ControlInfoMap::iterator ControlInfoMap::find(unsigned int id)\n */\n ControlInfoMap::const_iterator ControlInfoMap::find(unsigned int id) const\n {\n-\treturn find(idmap_.at(id));\n+\tauto iter = idmap_.find(id);\n+\tif (iter == idmap_.end())\n+\t\treturn end();\n+\n+\treturn find(iter->second);\n }\n \n /**\n","prefixes":["libcamera-devel","v2","03/24"]}