Patch Detail
Show a patch.
GET /api/1.1/patches/17388/?format=api
{ "id": 17388, "url": "https://patchwork.libcamera.org/api/1.1/patches/17388/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17388/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20220922202213.582824-1-Rauch.Christian@gmx.de>", "date": "2022-09-22T20:22:13", "name": "[libcamera-devel,v3] libcamera: controls: validate all ControlInfo values", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "93e96182e843ec6a82f2cf74d2f2f2fbfcb63c1a", "submitter": { "id": 111, "url": "https://patchwork.libcamera.org/api/1.1/people/111/?format=api", "name": "Christian Rauch", "email": "Rauch.Christian@gmx.de" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17388/mbox/", "series": [ { "id": 3497, "url": "https://patchwork.libcamera.org/api/1.1/series/3497/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3497", "date": "2022-09-22T20:22:13", "name": "[libcamera-devel,v3] libcamera: controls: validate all ControlInfo values", "version": 3, "mbox": "https://patchwork.libcamera.org/series/3497/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17388/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17388/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 604CABD16B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 22 Sep 2022 20:22:18 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 20AC26221C;\n\tThu, 22 Sep 2022 22:22:18 +0200 (CEST)", "from mout.gmx.net (mout.gmx.net [212.227.15.19])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CF01662217\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 22 Sep 2022 22:22:16 +0200 (CEST)", "from voyager ([88.152.184.103]) by mail.gmx.net (mrgmx005\n\t[212.227.17.190]) with ESMTPSA (Nemesis) id 1N79yQ-1pKPsS0vwC-017VCX;\n\tThu, 22 Sep 2022 22:22:16 +0200" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1663878138;\n\tbh=PcL+eoj9Jtgm+1kZtHNjrEX6V+jh5KtqDtDgpCNj2LE=;\n\th=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:From;\n\tb=POlkcV0c6E6UaMtf3R+R37D4bc8mvbgfRCdIAWrB4k7URk0Xk/VU/3QKWKvl2je7Z\n\twtHGDNo2PMUG4FHYgX6IjVePC4HJNjzgG2Eklp0s4PZaGj5cRbxApNP6gQQIX64mzk\n\tiA5Fqw9IMDtZYqG45VkqnOQqKA9G+XsFdEMT3/HOkDs8ly0TGnZMlKQjS7N0LPClFm\n\tEyO+WcZ+LUt9VTjqLW+hh9BHyXYEuo/dfW0liZDfZbwrFi6r/9KB5hyorW7hLoPmlL\n\tZZMumOSr7xaoKCgqLD0E1iDxgclEwfgZpMIlYAb31g9RYJwEIE4Ct8e76dhHZ/ceK0\n\tG4/nRAcYkH/zA==", "v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;\n\ts=badeba3b8450; t=1663878136;\n\tbh=PcL+eoj9Jtgm+1kZtHNjrEX6V+jh5KtqDtDgpCNj2LE=;\n\th=X-UI-Sender-Class:From:To:Cc:Subject:Date;\n\tb=Dm7iNZo6Y0US24dGCFoKG/Rimfs9NuSBZJsVPjHasKdQt8GeTms8mZ78Num+yUmU8\n\tz5hxNefO2nPTBUyKkzFHJs8t0s3B4h0jKDHPSECeG9/jfy38YrtGDrBpOpYK778pbS\n\tgGmbaP57o5vQxCMnWKmW/t8nK3I20n6ldeLMmgwM=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=gmx.net header.i=@gmx.net\n\theader.b=\"Dm7iNZo6\"; dkim-atps=neutral", "X-UI-Sender-Class": "01bb95c1-4bf8-414a-932a-4f6e2808ef9c", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 22 Sep 2022 22:22:13 +0200", "Message-Id": "<20220922202213.582824-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:NVJb3g35PYH6NTUvrZgBLLkPXjCdg8WzGFXDyUxFr07z8ZHVYDh\n\tBhEQDnFsuQcFleWWOIiHKd/1C0k6S29S1JKwvaPzrjtHY8EgFw+hYsRwtqxKYaIMURFz9Cv\n\tcNllKMHKMlT40nsNKLfr14o58V4VmO0/zCIHVVLeuJSu9MWovv8VaTuj7oU+oTYLwzxGxoR\n\tICiYGyJwpRhrOmLPag+wQ==", "X-Spam-Flag": "NO", "X-UI-Out-Filterresults": "notjunk:1; V03:K0:6YVXeFreqV8=:osesdX5MjbvqyKrVm8R/iq\n\t8IItSKs9CzVZ/iHF2bvW1eAW2iedmIoQ8qUYrOamiRl+gyWSEcmOLQ73LvOcJzSkh/GOMkTyH\n\tIGSq3FmaXW9FTLAm81A3+mX1tEcwBxvZ4P9FJBcTyMKiO/QO40NG2i71vZZBJMJuwXNKC7m9p\n\t81ApvtDWbVfLg+wZsqvNQcVFwiAbz7fq6qU5h1uM6EhIZIHPCUNq3nL5rjfmaA/tqf9G4LTic\n\t2zCovbO2PsZuloGF/8R7iCt2qbaTtwiFqMn8RtwCBAmxC2ZKTaRXiOpEVEyP8lF7CSapomj/M\n\tMTmyxnheWjcYMpAXQ0HRBOgeRBJW8jFTfDXtzwBUEnPhnwPOeag4ZxQkqjbZLbREQ6owckRL0\n\t/gisFUqgbMhE0r+8wUzWn7mtiG1w820YeygRVsBLSNiG64UVCsvaNxI83ghYlZFY1z+p27eiW\n\tCML0SZtI9+g7EFX389/kfKds1YUg54+FFKcfqTsHN28BUsXXhzwXNmALh3nDyWoqE/0Ghv+xD\n\tJXRN1vd3TP483WI5bPGdPMDKfSF2HcwXwz1aNX9h10pBd0x22u1XvI/LCh+00x25thsc8KngQ\n\tBrbLIemBScOsbFWTYPGWiWq4Zkmnu0ogc8iSbxtIitQIqdueZ3Wbm5VTrgZHrnsiVbqNIFsd4\n\tXObryzpX3WhE8U767olbv9TGKyVClzfHxAj07lcIKJD8ahofI5AXZeF8eg62475EZ40gcXYJy\n\teNJ7BgEu9siOYSt5f6A5SYVYoMt5LmTVxr7OQ9cdwPFMXyXfZ7WpXS3JiYlSVLjWqidRrAGNo\n\t+BCGbxw294mk2ULwnmf2U5AaFZAYZUw/S9uJqXZ2+8YBf0OrYDYJm81a5tAlMu/IzsMyil7++\n\tcWHAVoIerJaO1TqRb+NJtuMXqdiBFsJ3Wpa2H6c5Ftmeb1oOroqysjxHt0dokFdUA7XZ9scbh\n\tFUKX+gnOSj7Q+AekKVbKnbTr24xFH6RgpnZVnsYpf71yF7hiNkn2IP1Nf/br1X3uoF7RjwPAD\n\thOgQQKOOWsQnFM4ah8XtJvyXZZukg4Jde35dE4jWe4IDQ0O8ccSuqUB6XYWe4asgz1yxCiMEo\n\tsfgDdSXrLV0Q/+STHECTzyflXfxSwY7bZeF70yAAd9UKVIylwobZyd9SOD4RNs2FSyrrF+hZq\n\tX248ZxCWApg56urBAcUekT+OME", "Subject": "[libcamera-devel] [PATCH v3] libcamera: controls: validate all\n\tControlInfo values", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Christian Rauch via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Christian Rauch <Rauch.Christian@gmx.de>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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 <Rauch.Christian@gmx.de>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n src/libcamera/controls.cpp | 25 ++++++++++++++++++++++++-\n 1 file changed, 24 insertions(+), 1 deletion(-)\n\n--\n2.34.1", "diff": "diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex bc3db4f6..1e54a712 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -701,9 +701,32 @@ 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 \" << id->name()\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 \" << id->name()\n+\t\t\t\t<< \" range types mismatch\";\n+\t\t\treturn false;\n+\t\t}\n+\n+\t\tif (info.def().type() != ControlTypeNone &&\n+\t\t\tinfo.min().type() != info.def().type()) {\n+\t\t\tLOG(Controls, Error)\n+\t\t\t\t<< \"Control \" << id->name()\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+\t\t\t\t<< \"Control \" << id->name()\n \t\t\t\t<< \" type and info type mismatch\";\n \t\t\treturn false;\n \t\t}\n", "prefixes": [ "libcamera-devel", "v3" ] }