{"id":2306,"url":"https://patchwork.libcamera.org/api/patches/2306/?format=json","web_url":"https://patchwork.libcamera.org/patch/2306/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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-11-laurent.pinchart@ideasonboard.com>","date":"2019-11-08T20:53:55","name":"[libcamera-devel,v2,10/24] libcamera: controls: Catch type mismatch in ControlInfoMap","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"7bf135e8cd8444afbae3222c96fff70760b8b49f","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2306/mbox/","series":[{"id":568,"url":"https://patchwork.libcamera.org/api/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/2306/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2306/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 342AD61373\n\tfor ;\n\tFri, 8 Nov 2019 21:54:26 +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 CF2362D1\n\tfor ;\n\tFri, 8 Nov 2019 21:54:25 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1573246465;\n\tbh=rvel1WbwIi38a5JoPv5cDk5BY2zcxawNIjeP/GSlCEg=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=DmlL921pe8Bwp+k5qeFK3B3lWnyJMkriX7OjZSl8oXxAoLrEQur1GqRbOlsLJDxUr\n\tx6aPMZBtPFHbEsuEvOaKJnM+07lMpBJt883aPOLAdocU7LyM/OCRkRT2CYc79rTVY4\n\tsKqPFxphygv4lpEQJyov+NJ9E1IJEXPJ62GlVMBU=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 8 Nov 2019 22:53:55 +0200","Message-Id":"<20191108205409.18845-11-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 10/24] libcamera: controls: Catch type\n\tmismatch in ControlInfoMap","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:27 -0000"},"content":"ControlInfoMap requires the ControlId and ControlRange of each entry to\nhave identical types. Check for this and log an error if a mismatch is\ndetected.\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/controls.cpp | 13 ++++++++++++-\n 1 file changed, 12 insertions(+), 1 deletion(-)","diff":"diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex eae0250a92e3..c488b2e4eb3f 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -571,8 +571,19 @@ ControlInfoMap::const_iterator ControlInfoMap::find(unsigned int id) const\n void ControlInfoMap::generateIdmap()\n {\n \tidmap_.clear();\n-\tfor (const auto &ctrl : *this)\n+\n+\tfor (const auto &ctrl : *this) {\n+\t\tif (ctrl.first->type() != ctrl.second.min().type()) {\n+\t\t\tLOG(Controls, Error)\n+\t\t\t\t<< \"Control \" << utils::hex(ctrl.first->id())\n+\t\t\t\t<< \" type and range type mismatch\";\n+\t\t\tidmap_.clear();\n+\t\t\tclear();\n+\t\t\treturn;\n+\t\t}\n+\n \t\tidmap_[ctrl.first->id()] = ctrl.first;\n+\t}\n }\n \n /**\n","prefixes":["libcamera-devel","v2","10/24"]}