{"id":17387,"url":"https://patchwork.libcamera.org/api/patches/17387/?format=json","web_url":"https://patchwork.libcamera.org/patch/17387/","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":"<20220921203148.534883-1-Rauch.Christian@gmx.de>","date":"2022-09-21T20:31:48","name":"[libcamera-devel,v2] libcamera: controls: validate all ControlInfo values","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"bbe3efcb1037537f66532c4f8bcf05d7eabace25","submitter":{"id":111,"url":"https://patchwork.libcamera.org/api/people/111/?format=json","name":"Christian Rauch","email":"Rauch.Christian@gmx.de"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/17387/mbox/","series":[{"id":3496,"url":"https://patchwork.libcamera.org/api/series/3496/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3496","date":"2022-09-21T20:31:48","name":"[libcamera-devel,v2] libcamera: controls: validate all ControlInfo values","version":2,"mbox":"https://patchwork.libcamera.org/series/3496/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/17387/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17387/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 3F42BC3272\n\tfor ;\n\tWed, 21 Sep 2022 20:31:53 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 413BA621F7;\n\tWed, 21 Sep 2022 22:31:52 +0200 (CEST)","from mout.gmx.net (mout.gmx.net [212.227.17.20])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 45C33600AA\n\tfor ;\n\tWed, 21 Sep 2022 22:31:51 +0200 (CEST)","from voyager ([88.152.184.103]) by mail.gmx.net (mrgmx104\n\t[212.227.17.168]) with ESMTPSA (Nemesis) id 1MYvY8-1ooBHC2tdo-00Utom;\n\tWed, 21 Sep 2022 22:31:50 +0200"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1663792312;\n\tbh=aj3ajD/LDm8mwmf5xHowf/c/s3BnrJuClZoHb89cAJA=;\n\th=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:From;\n\tb=v4QXAqC0W7/UVEy6Zo6YP5IY5aZQRAouW+o+pYbCHk8YxP1MaMqGpksKGtzB6raEw\n\tExHXiunyUW8lK9z1ULmktTyC4O1tMeTK0FfviTmtI5KzfKueyLwqp5fyf70w6buxcD\n\ttp5WP3RxVhz8Ld0g6MjfOm/OdBhnY3fmBfjxaMwPOEbv6m+I8v8LvS2QhRjPi8guVM\n\trAuBi3ae7suW1T/ZYK61YdROcL3It+MJbgsHwUes1hCrws0vG7v4+PpAIGg1Q2XakM\n\t8V3LXZTYoF9FXQtqXb6f833IVpKkmRI2y51tzZGBJkNeoT8n1g0zVUf+wml4uRmSjB\n\t9UEIndCJIsQsg==","v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;\n\ts=badeba3b8450; t=1663792310;\n\tbh=aj3ajD/LDm8mwmf5xHowf/c/s3BnrJuClZoHb89cAJA=;\n\th=X-UI-Sender-Class:From:To:Cc:Subject:Date;\n\tb=CtM1V4vRlKXPjwJ/s3SOL2Vhxmeb3EHAmZzAZ8J7bJuhbrqBp9aUVJsuzydAosQ5h\n\tBwY5Rs/oc5Tv/71WJTzO/gNJ52vfsRCN8wJoRB8h0LFjpmb6s8Q6pckGBRinuGKpS6\n\t7kQxyIjpRkGz0QSt6cMjMe46f2F8u5+XsrQL8/bo="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=gmx.net header.i=@gmx.net\n\theader.b=\"CtM1V4vR\"; dkim-atps=neutral","X-UI-Sender-Class":"01bb95c1-4bf8-414a-932a-4f6e2808ef9c","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 21 Sep 2022 22:31:48 +0200","Message-Id":"<20220921203148.534883-1-Rauch.Christian@gmx.de>","X-Mailer":"git-send-email 2.34.1","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","X-Provags-ID":"V03:K1:3kmT9imW89RWO2Z2oAT130/ZkZuzcVtFbwzy4aFRILoe0hNP0Z+\n\tGzj6OQ4vwzmk3NIDsInq3/IUIchjW1f2heCbVjRBz+Cb7XWk5h/k8+ykHpG7PYzOUcYrlxI\n\tD0qdxRVZXg/vgNEEd7rtkagUPOxpKd4oSnGWdnr83q2F8qqSHUNaK+Nxiu4JVH267wA11Rg\n\t83Hl6nNOe0BcDH9O23IAw==","X-Spam-Flag":"NO","X-UI-Out-Filterresults":"notjunk:1; V03:K0:eqVsnEwbNVo=:MFrLXiBxQy1Eyq/uvFLTl9\n\tEufvZR+qTN/yBRaTqqhsr88xyhSnXj4sumgfVypFsiX4bZZrSCoRKNzwD/D1f63s1jlEvVZlq\n\tsePOihyW4y8q8IOnT+ZD2B+8kjG+XbuEgQs75As7npnNvJLK35OnQzubyDHOoZtYye7P+ONIr\n\tVdZCvGK9h5BXT3ugwhW4RS8CPpA8L0Qajh78SLYEX4eQpA39oFDIqoWiGIT7xVqyQ8BGrForT\n\tHXiU/IgrdU6GDtYjUJhlLM10bXJD+Z0aY2vg6YvOddFxEw3AToqxAK932JMtRFAP95sNAts+D\n\tSQGQ6A45VP0maNoXVsSuabBlil33XQTvN9+aNdcSsVTgLr+mbRE/NGvnv92BrjY3SGhlN5yCV\n\twRzgbePXkl6EJeju3IwJ6Yjj0+74jGssSgP+13/RnCoWIP0anpXMQg4mSgtf33TU9hheQ43AO\n\tV5YnP1NQMfEDNAGTO9VTR+ThElUxDzX36Nbm/hyiuAbNrRdLk8rjsqJ1gAFuQuwOtLr4tma9H\n\tp1IwfFg1yISSettA+YLwS2X0Tm9xGRvz8YB6m2oy7j2QfAIaJsAet7BPGbJgHqvd+R0ehzij/\n\tBsML8gdMjTR2nLndbJNuFK0cwgBzS/ztg+C0xj1V0wVrR79H0KH5KwgJdbP9kwRaluLtAN6Yi\n\tklPP8jh6ypXm+LkLsbPM6ZPL7OKcZJSCm0tcUzH2uHbZcoUqo7ylx3bEdRebEYxkJdgKiX2k0\n\tr47I0NlLAXvYfq2poSdOm/cyt8GPl9eUIyh0Cbc3THX14OzTiEloN/Ya0HkcF/OBcibdH5lk1\n\tTZCo5Eib9kHeds70ELgq+EuuWPWPEyLPD2Cvyh0Cyj5D2I1Jl+UbH4uy2kMbiAeJAAQVNerQZ\n\teXxblJxVKjE7y3CB6ZawDs+1f7G0PycwbvoKG3KFZWYXGShKrTgOX/R6sjNkaQAX+e3sxnrYw\n\t1iMPJkaJ6s0Aohgw/TA1ST5zpspGQQwTPixw8a+0sc8b4G1IuInHpscDIGkvUUl4WQaUEO0vX\n\tidiLlG1TW5Mf+B+n6B9zqtMk9nVkKBjL8vw6XLva1rUtsn31mWkjPyKDPqqDIsiRBtD/4e84h\n\tEbUKJrEUe1iZBLuC3Gr2SUTwSeFbPkhShubKzqa9ygR3ooIKwSN38ipMJJPFvHZCcNr/aDngQ\n\twUU0OsQAxpKsMKBFFQD46disBF","Subject":"[libcamera-devel] [PATCH v2] libcamera: controls: validate all\n\tControlInfo values","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","From":"Christian Rauch via libcamera-devel\n\t","Reply-To":"Christian Rauch ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"ControlInfoMap::validate only checks the 'min' type against the ControlId\ntype. Extend this with checks against the 'max' type and the 'def' type,\nif a default is specified. This forces the min/max bounds to have the same\ntype as the controlled value, but leaves the default optional.\n\nSigned-off-by: Christian Rauch \n---\n src/libcamera/controls.cpp | 22 ++++++++++++++++++++++\n 1 file changed, 22 insertions(+)\n\n--\n2.34.1","diff":"diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex bc3db4f6..e7251507 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -701,6 +701,28 @@ bool ControlInfoMap::validate()\n \t\t\t\t ? ControlTypeInteger32 : id->type();\n \t\tconst ControlInfo &info = ctrl.second;\n\n+\t\tif (!(info.min().isArray() == info.max().isArray() &&\n+\t\t info.min().numElements() == info.max().numElements())) {\n+\t\t\tLOG(Controls, Error)\n+\t\t\t\t<< \"Control \" << utils::hex(id->id())\n+\t\t\t\t<< \" range must have the same dimension.\";\n+\t\t\treturn false;\n+\t\t}\n+\n+\t\tif (info.min().type() != info.max().type()) {\n+\t\t\tLOG(Controls, Error)\n+\t\t\t\t<< \"Control \" << utils::hex(id->id())\n+\t\t\t\t<< \" range types mismatch\";\n+\t\t\treturn false;\n+\t\t}\n+\n+\t\tif (info.def().type() != ControlTypeNone && (info.min().type() != info.def().type())) {\n+\t\t\tLOG(Controls, Error)\n+\t\t\t\t<< \"Control \" << utils::hex(id->id())\n+\t\t\t\t<< \" default value and info type mismatch\";\n+\t\t\treturn false;\n+\t\t}\n+\n \t\tif (info.min().type() != rangeType) {\n \t\t\tLOG(Controls, Error)\n \t\t\t\t<< \"Control \" << utils::hex(id->id())\n","prefixes":["libcamera-devel","v2"]}