{"id":651,"url":"https://patchwork.libcamera.org/api/patches/651/?format=json","web_url":"https://patchwork.libcamera.org/patch/651/","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":"<20190228021626.15062-5-niklas.soderlund@ragnatech.se>","date":"2019-02-28T02:16:26","name":"[libcamera-devel,v2,4/4] libcamera: camera: ensure streams belong to camera","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4694089b488ca4c2b852f6ae9cc1a764d28723e9","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/651/mbox/","series":[{"id":195,"url":"https://patchwork.libcamera.org/api/series/195/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=195","date":"2019-02-28T02:16:23","name":"libcamera: improve validation of camera operations","version":2,"mbox":"https://patchwork.libcamera.org/series/195/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/651/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/651/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 80A13610B7\n\tfor ;\n\tThu, 28 Feb 2019 03:16:39 +0100 (CET)","from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid e0a78cc7-3afe-11e9-985a-005056917f90;\n\tThu, 28 Feb 2019 03:16:37 +0100 (CET)"],"X-Halon-ID":"e0a78cc7-3afe-11e9-985a-005056917f90","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 28 Feb 2019 03:16:26 +0100","Message-Id":"<20190228021626.15062-5-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20190228021626.15062-1-niklas.soderlund@ragnatech.se>","References":"<20190228021626.15062-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 4/4] libcamera: camera: ensure streams\n\tbelong to camera","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 28 Feb 2019 02:16:39 -0000"},"content":"Before calling into the pipeline handler make sure the streams provided\nby the application actually belongs to the camera.\n\nSigned-off-by: Niklas Söderlund \n---\n src/libcamera/camera.cpp | 10 ++++++++++\n 1 file changed, 10 insertions(+)","diff":"diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex 4f0833300b9b7ffc..52992e577b6ab011 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -337,6 +337,11 @@ Camera::streamConfiguration(std::set &streams)\n \tif (disconnected_ || !streams.size())\n \t\treturn std::map{};\n \n+\tfor (Stream *stream : streams) {\n+\t\tif (streams_.find(stream) == streams_.end())\n+\t\t\treturn std::map{};\n+\t}\n+\n \treturn pipe_->streamConfiguration(this, streams);\n }\n \n@@ -378,6 +383,11 @@ int Camera::configureStreams(std::map &config)\n \t\treturn -EINVAL;\n \t}\n \n+\tfor (auto const &iter : config) {\n+\t\tif (streams_.find(iter.first) == streams_.end())\n+\t\t\treturn -EINVAL;\n+\t}\n+\n \tret = pipe_->configureStreams(this, config);\n \tif (ret)\n \t\treturn ret;\n","prefixes":["libcamera-devel","v2","4/4"]}