[{"id":13748,"web_url":"https://patchwork.libcamera.org/comment/13748/","msgid":"<549a7595-f1d5-72bd-930d-5829ebc3fd16@ideasonboard.com>","date":"2020-11-17T13:29:36","subject":"Re: [libcamera-devel] [PATCH] libcamera: Avoid accessing a non\n\texistent control","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jean-Michel,\n\nThanks for highlighting this issue, and providing a fix.\n\n\nOn 17/11/2020 13:24, Jean-Michel Hautbois wrote:\n> When pushing a controlone should check if it exists before accessing it,\n\ns/controlone/control, one/\n\ns/it,/it/\n\n> in order to avoid raising abort and crash.\n> \n> Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\n> ---\n>  src/libcamera/delayed_controls.cpp | 6 +++++-\n>  1 file changed, 5 insertions(+), 1 deletion(-)\n> \n> diff --git a/src/libcamera/delayed_controls.cpp b/src/libcamera/delayed_controls.cpp\n> index f1c5f890..422deee5 100644\n> --- a/src/libcamera/delayed_controls.cpp\n> +++ b/src/libcamera/delayed_controls.cpp\n> @@ -147,7 +147,11 @@ bool DelayedControls::queue(const ControlList &controls)\n>  \n>  \t/* Update with new controls. */\n>  \tfor (const auto &control : controls) {\n> -\t\tconst ControlId *id = device_->controls().idmap().at(control.first);\n> +\t\tconst ControlIdMap &idmap = device_->controls().idmap();\n> +\t\tif (idmap.find(control.first) == idmap.end())\n> +\t\t\treturn false;\n> +\n> +\t\tconst ControlId *id = idmap.at(control.first);\n>  \n\nThis does two look ups, (idmap.find(), idmap.at()).\n\nWe could combine those to a single lookup by first doing the find, and\nkeeping the iterator, then using it (if it is not equal to idmap.end())...\n\n\nWith that fixed,\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard>\n\nHowever, given that this patch is against an out of tree patch - I\nanticipate the fix should be squashed into the relevant patch before\nintegration, so I'll leave this up to Niklas.\n\n--\nKieran\n\n\n>  \t\tif (delays_.find(id) == delays_.end())\n>  \t\t\treturn false;\n>","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 4774FBE081\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 17 Nov 2020 13:29:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 997486033B;\n\tTue, 17 Nov 2020 14:29:40 +0100 (CET)","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 4E89F6033B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 17 Nov 2020 14:29:39 +0100 (CET)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9C3842A3;\n\tTue, 17 Nov 2020 14:29:38 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"A5SfYXFW\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1605619778;\n\tbh=hc1ZopD0TTFtc8WZ+OhiMzaCayTvO7AbFziLBH3waoc=;\n\th=Reply-To:Subject:To:References:From:Cc:Date:In-Reply-To:From;\n\tb=A5SfYXFWT/KBDiI4ZW8/KwsGZP9j7da2xv/tbFa+uLwKcxOIiQI9CFfT/jqZkdnJB\n\tAkIMHPN4pu+LlF36DRQb3kjjVU2OU4od7DNyiUcP55T/1To7L4gIGVTMB2VgN1YkBn\n\tPvxOKoG2V7IcDB9uhUyYNW7jlPOs4Jv+RCgPkUB4=","To":"Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20201117132432.238405-1-jeanmichel.hautbois@ideasonboard.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<549a7595-f1d5-72bd-930d-5829ebc3fd16@ideasonboard.com>","Date":"Tue, 17 Nov 2020 13:29:36 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20201117132432.238405-1-jeanmichel.hautbois@ideasonboard.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH] libcamera: Avoid accessing a non\n\texistent control","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>","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":13767,"web_url":"https://patchwork.libcamera.org/comment/13767/","msgid":"<17189c70-6ecb-cd9a-3535-dd166683d3b8@ideasonboard.com>","date":"2020-11-17T22:08:59","subject":"Re: [libcamera-devel] [PATCH] libcamera: Avoid accessing a non\n\texistent control","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/people/75/","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"content":"Hi Kieran,\n\nOn 17/11/2020 14:29, Kieran Bingham wrote:\n> Hi Jean-Michel,\n> \n> Thanks for highlighting this issue, and providing a fix.\n> \n> \n> On 17/11/2020 13:24, Jean-Michel Hautbois wrote:\n>> When pushing a controlone should check if it exists before accessing it,\n> \n> s/controlone/control, one/\n> \n> s/it,/it/\n\nSure... :-)\n\n>> in order to avoid raising abort and crash.\n>>\n>> Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\n>> ---\n>>  src/libcamera/delayed_controls.cpp | 6 +++++-\n>>  1 file changed, 5 insertions(+), 1 deletion(-)\n>>\n>> diff --git a/src/libcamera/delayed_controls.cpp b/src/libcamera/delayed_controls.cpp\n>> index f1c5f890..422deee5 100644\n>> --- a/src/libcamera/delayed_controls.cpp\n>> +++ b/src/libcamera/delayed_controls.cpp\n>> @@ -147,7 +147,11 @@ bool DelayedControls::queue(const ControlList &controls)\n>>  \n>>  \t/* Update with new controls. */\n>>  \tfor (const auto &control : controls) {\n>> -\t\tconst ControlId *id = device_->controls().idmap().at(control.first);\n>> +\t\tconst ControlIdMap &idmap = device_->controls().idmap();\n>> +\t\tif (idmap.find(control.first) == idmap.end())\n>> +\t\t\treturn false;\n>> +\n>> +\t\tconst ControlId *id = idmap.at(control.first);\n>>  \n> \n> This does two look ups, (idmap.find(), idmap.at()).\n> \n> We could combine those to a single lookup by first doing the find, and\n> keeping the iterator, then using it (if it is not equal to idmap.end())...\n\nYes, indeed !\n\n> \n> With that fixed,\n> \n> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard>\n> \n> However, given that this patch is against an out of tree patch - I\n> anticipate the fix should be squashed into the relevant patch before\n> integration, so I'll leave this up to Niklas.\n\nI agree :-)\n> --\n> Kieran\n> \n> \n>>  \t\tif (delays_.find(id) == delays_.end())\n>>  \t\t\treturn false;\n>>\n>","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 C072FBE081\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 17 Nov 2020 22:09:01 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 54AB663322;\n\tTue, 17 Nov 2020 23:09:01 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 87CA363282\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 17 Nov 2020 23:09:00 +0100 (CET)","from [IPv6:2a01:e0a:169:7140:d5de:1f8c:872a:c380] (unknown\n\t[IPv6:2a01:e0a:169:7140:d5de:1f8c:872a:c380])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0CCC82A3;\n\tTue, 17 Nov 2020 23:09:00 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"El3WghuJ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1605650940;\n\tbh=P3LyjMG4xtk5ee5/j8wYj5fbqNHpAiaupXIi5/VYHVk=;\n\th=Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=El3WghuJqTCpNsvUxNWJ28JjDloapo+ChuF1DS88u6fqKyX0aV8DsQt0Zx6PAgGNI\n\tmSXr7l3xgHPKgXs0cm03AQqAXfcIQyQ0vMIvuXbyPngjbonxU0YnZ4jLpdGzEZMqMD\n\tGZ2ygXIVYVgw58aWcpZu/RU9UV3bRnocAH/7armc=","To":"kieran.bingham@ideasonboard.com,\n\tJean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20201117132432.238405-1-jeanmichel.hautbois@ideasonboard.com>\n\t<549a7595-f1d5-72bd-930d-5829ebc3fd16@ideasonboard.com>","From":"Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>","Message-ID":"<17189c70-6ecb-cd9a-3535-dd166683d3b8@ideasonboard.com>","Date":"Tue, 17 Nov 2020 23:08:59 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.3.2","MIME-Version":"1.0","In-Reply-To":"<549a7595-f1d5-72bd-930d-5829ebc3fd16@ideasonboard.com>","Content-Language":"en-US","Subject":"Re: [libcamera-devel] [PATCH] libcamera: Avoid accessing a non\n\texistent control","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>","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":13832,"web_url":"https://patchwork.libcamera.org/comment/13832/","msgid":"<20201123165445.GD1773213@oden.dyn.berto.se>","date":"2020-11-23T16:54:45","subject":"Re: [libcamera-devel] [PATCH] libcamera: Avoid accessing a non\n\texistent control","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Jean-Michel,\n\nThanks for your patch.\n\nOn 2020-11-17 23:08:59 +0100, Jean-Michel Hautbois wrote:\n> Hi Kieran,\n> \n> On 17/11/2020 14:29, Kieran Bingham wrote:\n> > Hi Jean-Michel,\n> > \n> > Thanks for highlighting this issue, and providing a fix.\n> > \n> > \n> > On 17/11/2020 13:24, Jean-Michel Hautbois wrote:\n> >> When pushing a controlone should check if it exists before accessing it,\n> > \n> > s/controlone/control, one/\n> > \n> > s/it,/it/\n> \n> Sure... :-)\n> \n> >> in order to avoid raising abort and crash.\n> >>\n> >> Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\n> >> ---\n> >>  src/libcamera/delayed_controls.cpp | 6 +++++-\n> >>  1 file changed, 5 insertions(+), 1 deletion(-)\n> >>\n> >> diff --git a/src/libcamera/delayed_controls.cpp b/src/libcamera/delayed_controls.cpp\n> >> index f1c5f890..422deee5 100644\n> >> --- a/src/libcamera/delayed_controls.cpp\n> >> +++ b/src/libcamera/delayed_controls.cpp\n> >> @@ -147,7 +147,11 @@ bool DelayedControls::queue(const ControlList &controls)\n> >>  \n> >>  \t/* Update with new controls. */\n> >>  \tfor (const auto &control : controls) {\n> >> -\t\tconst ControlId *id = device_->controls().idmap().at(control.first);\n> >> +\t\tconst ControlIdMap &idmap = device_->controls().idmap();\n> >> +\t\tif (idmap.find(control.first) == idmap.end())\n> >> +\t\t\treturn false;\n> >> +\n> >> +\t\tconst ControlId *id = idmap.at(control.first);\n> >>  \n> > \n> > This does two look ups, (idmap.find(), idmap.at()).\n> > \n> > We could combine those to a single lookup by first doing the find, and\n> > keeping the iterator, then using it (if it is not equal to idmap.end())...\n> \n> Yes, indeed !\n> \n> > \n> > With that fixed,\n> > \n> > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard>\n> > \n> > However, given that this patch is against an out of tree patch - I\n> > anticipate the fix should be squashed into the relevant patch before\n> > integration, so I'll leave this up to Niklas.\n> \n> I agree :-)\n\nI have integrated this in the out-of-tree patch as,\n\ndiff --git a/src/libcamera/delayed_controls.cpp b/src/libcamera/delayed_controls.cpp\nindex f1c5f890957ec040..4651e71aa53b884a 100644\n--- a/src/libcamera/delayed_controls.cpp\n+++ b/src/libcamera/delayed_controls.cpp\n@@ -146,8 +146,13 @@ bool DelayedControls::queue(const ControlList &controls)\n        }\n \n        /* Update with new controls. */\n+       const ControlIdMap &idmap = device_->controls().idmap();\n        for (const auto &control : controls) {\n-               const ControlId *id = device_->controls().idmap().at(control.first);\n+               const auto &itCtrl = idmap.find(control.first);\n+               if (itCtrl == idmap.end())\n+                       return false;\n+\n+               const ControlId *id = itCtrl->second;\n \n                if (delays_.find(id) == delays_.end())\n                        return false;\n\n> > --\n> > Kieran\n> > \n> > \n> >>  \t\tif (delays_.find(id) == delays_.end())\n> >>  \t\t\treturn false;\n> >>\n> >","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 A1B3ABE08A\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 23 Nov 2020 16:54:49 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 238DD633F4;\n\tMon, 23 Nov 2020 17:54:49 +0100 (CET)","from mail-lj1-x242.google.com (mail-lj1-x242.google.com\n\t[IPv6:2a00:1450:4864:20::242])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 31853633F0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 23 Nov 2020 17:54:47 +0100 (CET)","by mail-lj1-x242.google.com with SMTP id z1so399976ljn.4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 23 Nov 2020 08:54:47 -0800 (PST)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tf21sm22002ljj.71.2020.11.23.08.54.45\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 23 Nov 2020 08:54:45 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com\n\theader.b=\"a4DItw0c\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=f5KCNe8ot03WWbn6fz6b2bfkYcm2a7NjTyp+6C7lvOk=;\n\tb=a4DItw0c4oP8DHsKf0l2pqGbYIbWf2+pYAzY+FiA/6FGDvTNG8QE9ANvpdMxIveX0P\n\tvKIjrXrmiY0XE50Tx4Fw6zJ0LDmE7Mc85CJtjYylO0mpicGCcCVfBIMc3/gHUDD+o0iB\n\tWlFuwRm4XRuGsiNw8G6u86nduaxwSEGbSqkDvhas8cP4/Sj0M3crU+3GyOYa0L67aMZw\n\tyV5Dk+9ttLYqNXIXPDtF+vRbaej2aeKSsK00eiVpK0UYh0OVhauCW0nxgVvFNUG+6LwG\n\tylGsmu1vOQV2ngKOzzyz3m558oyx5YyUA5wE/6mhB5yeKFlnaPs4VVCR3aXyBZd6lgO8\n\txzvg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=f5KCNe8ot03WWbn6fz6b2bfkYcm2a7NjTyp+6C7lvOk=;\n\tb=S/q3mUq9MLuaxf27gEqHp3Uz+jwTJu6mB2nqeSyo/kg9EtgsYYtT4l3mTdJrTpW13T\n\t4adEMe5qJK2thgkwht4S1MiJ7mMfWqwvfomIMi2lK+znLgwOfRTbHydjJFWECcyiU2qO\n\tljisO4SEDKyW07ADktPquYqqz1S00sDN3yMUivQIZPS0iKIeVa+jivIpE2vOUZ3jgj4Q\n\t1lOG2db2B2243kSkFKKceVw0NnZsAq8d37KJt7gEF/cXsNIKh8Cifkh6Dgg3l/tNYcup\n\tFCkpLcumtr5VZYpqGn9Tfoa0AP1PK4pij4jEAlV1tAee5SMt7Cs+y4NHUUoYl8DH0xPi\n\tCKjg==","X-Gm-Message-State":"AOAM530OfonQui5XEwmNM85Fk8dgfoJUNuF4nYXWkIPOALETdRdLwlNd\n\ttP+6uq8IWIamfuG/jgE1HSeXIYMb3uFgmYPY","X-Google-Smtp-Source":"ABdhPJxbssw4spIYj4twvkE7FtI3o+3woJFCOvTPNxzyuq7RFVs2a7tgi1IwrnyWsZTQelbWbvIE8g==","X-Received":"by 2002:a2e:93cd:: with SMTP id p13mr116764ljh.313.1606150486557;\n\tMon, 23 Nov 2020 08:54:46 -0800 (PST)","Date":"Mon, 23 Nov 2020 17:54:45 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= <niklas.soderlund@ragnatech.se>","To":"Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>","Message-ID":"<20201123165445.GD1773213@oden.dyn.berto.se>","References":"<20201117132432.238405-1-jeanmichel.hautbois@ideasonboard.com>\n\t<549a7595-f1d5-72bd-930d-5829ebc3fd16@ideasonboard.com>\n\t<17189c70-6ecb-cd9a-3535-dd166683d3b8@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<17189c70-6ecb-cd9a-3535-dd166683d3b8@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH] libcamera: Avoid accessing a non\n\texistent control","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>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]