{"id":10444,"url":"https://patchwork.libcamera.org/api/1.1/patches/10444/?format=json","web_url":"https://patchwork.libcamera.org/patch/10444/","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":"<20201117132432.238405-1-jeanmichel.hautbois@ideasonboard.com>","date":"2020-11-17T13:24:32","name":"[libcamera-devel] libcamera: Avoid accessing a non existent control","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"ee53b24a6530f8f3dabcc7e3b26cdca35c494ee6","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/1.1/people/75/?format=json","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10444/mbox/","series":[{"id":1467,"url":"https://patchwork.libcamera.org/api/1.1/series/1467/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1467","date":"2020-11-17T13:24:32","name":"[libcamera-devel] libcamera: Avoid accessing a non existent control","version":1,"mbox":"https://patchwork.libcamera.org/series/1467/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10444/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10444/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 37100BE082\n\tfor ;\n\tTue, 17 Nov 2020 13:24:37 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9C15463322;\n\tTue, 17 Nov 2020 14:24:36 +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 CF93B6033B\n\tfor ;\n\tTue, 17 Nov 2020 14:24:35 +0100 (CET)","from localhost.localdomain (unknown\n\t[IPv6:2a01:e0a:169:7140:d5de:1f8c:872a:c380])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6935D2A3;\n\tTue, 17 Nov 2020 14:24:35 +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=\"MLx264wb\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1605619475;\n\tbh=3fsMRR0qHd1viUL8kiMLJO11No0iH92uWuKCWAQUzNg=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=MLx264wbIPewPzj8L5MXfZ652uM8+Vi3i7eKbdcRLDPddfZ43an/heBz3E+sBTWPH\n\tCuwiuCIEEF+DNJZQv5D7JorsCo8c6gVHm90mUuSDI89GsBM9vad4Xoy3vFQSwvfUIZ\n\trPibDEijbqnDuGRY3913IAIRaxafxODeTrNTlWNQ=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 17 Nov 2020 14:24:32 +0100","Message-Id":"<20201117132432.238405-1-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH] libcamera: Avoid accessing a non existent\n\tcontrol","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"When pushing a controlone should check if it exists before accessing it,\nin order to avoid raising abort and crash.\n\nSigned-off-by: Jean-Michel Hautbois \n---\n src/libcamera/delayed_controls.cpp | 6 +++++-\n 1 file changed, 5 insertions(+), 1 deletion(-)","diff":"diff --git a/src/libcamera/delayed_controls.cpp b/src/libcamera/delayed_controls.cpp\nindex 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 \t\tif (delays_.find(id) == delays_.end())\n \t\t\treturn false;\n","prefixes":["libcamera-devel"]}