{"id":12594,"url":"https://patchwork.libcamera.org/api/patches/12594/?format=json","web_url":"https://patchwork.libcamera.org/patch/12594/","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":"<20210615002047.25393-1-laurent.pinchart@ideasonboard.com>","date":"2021-06-15T00:20:47","name":"[libcamera-devel] android; camera_device: Reset config_ if Camera::configure() fails","commit_ref":"7532caa2c77b966afde643d5550dff6e404e7208","pull_url":null,"state":"accepted","archived":false,"hash":"e765e6b75473f82d0d95b422477e4c838686d486","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12594/mbox/","series":[{"id":2133,"url":"https://patchwork.libcamera.org/api/series/2133/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2133","date":"2021-06-15T00:20:47","name":"[libcamera-devel] android; camera_device: Reset config_ if Camera::configure() fails","version":1,"mbox":"https://patchwork.libcamera.org/series/2133/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12594/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12594/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 F30B0C3218\n\tfor ;\n\tTue, 15 Jun 2021 00:21:16 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5E22D68931;\n\tTue, 15 Jun 2021 02:21:16 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 32A0D687EF\n\tfor ;\n\tTue, 15 Jun 2021 02:21:15 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B003745E\n\tfor ;\n\tTue, 15 Jun 2021 02:21:14 +0200 (CEST)"],"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=\"QoLcxOv6\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1623716474;\n\tbh=ZoXW9I4A51NvkEb3wAvtRcBAMcrFHza80THO3RvaVLs=;\n\th=From:To:Subject:Date:From;\n\tb=QoLcxOv6ugId1VvZm3xxAB3jbO4CfCcYwFYBbJTvWoRKn0CTMDkjxIa3qyEQgmElD\n\t5raItoCCS51kmhVfQJCIv1+Uqu1ZXVVO7yHZE1NMvX0288e8GXHGmNdj/MdbKvOQ+O\n\tkUOjoM0Yhq15eaWHN3hlWeRClBcn5LiqzHegLgyQ=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 15 Jun 2021 03:20:47 +0300","Message-Id":"<20210615002047.25393-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] android;\n\tcamera_device: Reset config_ if Camera::configure() fails","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The config_ pointer is reset in all error paths of the\nCameraDevice::configureStreams() function, except when\nCamera::configure() fails. Fix it by using a local unique pointer to\nstore the configuration until the end of the function, to avoid similar\nissues in the future.\n\nSigned-off-by: Laurent Pinchart \n---\n src/android/camera_device.cpp | 17 ++++++++---------\n 1 file changed, 8 insertions(+), 9 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex f3fd38690e63..f0b5f87bc38f 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1716,8 +1716,8 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t * Generate an empty configuration, and construct a StreamConfiguration\n \t * for each camera3_stream to add to it.\n \t */\n-\tconfig_ = camera_->generateConfiguration();\n-\tif (!config_) {\n+\tstd::unique_ptr config = camera_->generateConfiguration();\n+\tif (!config) {\n \t\tLOG(HAL, Error) << \"Failed to generate camera configuration\";\n \t\treturn -EINVAL;\n \t}\n@@ -1855,29 +1855,27 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \n \tsortCamera3StreamConfigs(streamConfigs, jpegStream);\n \tfor (const auto &streamConfig : streamConfigs) {\n-\t\tconfig_->addConfiguration(streamConfig.config);\n+\t\tconfig->addConfiguration(streamConfig.config);\n \n \t\tfor (auto &stream : streamConfig.streams) {\n \t\t\tstreams_.emplace_back(this, stream.type, stream.stream,\n-\t\t\t\t\t config_->size() - 1);\n+\t\t\t\t\t config->size() - 1);\n \t\t\tstream.stream->priv = static_cast(&streams_.back());\n \t\t}\n \t}\n \n-\tswitch (config_->validate()) {\n+\tswitch (config->validate()) {\n \tcase CameraConfiguration::Valid:\n \t\tbreak;\n \tcase CameraConfiguration::Adjusted:\n \t\tLOG(HAL, Info) << \"Camera configuration adjusted\";\n \n-\t\tfor (const StreamConfiguration &cfg : *config_)\n+\t\tfor (const StreamConfiguration &cfg : *config)\n \t\t\tLOG(HAL, Info) << \" - \" << cfg.toString();\n \n-\t\tconfig_.reset();\n \t\treturn -EINVAL;\n \tcase CameraConfiguration::Invalid:\n \t\tLOG(HAL, Info) << \"Camera configuration invalid\";\n-\t\tconfig_.reset();\n \t\treturn -EINVAL;\n \t}\n \n@@ -1885,7 +1883,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t * Once the CameraConfiguration has been adjusted/validated\n \t * it can be applied to the camera.\n \t */\n-\tint ret = camera_->configure(config_.get());\n+\tint ret = camera_->configure(config.get());\n \tif (ret) {\n \t\tLOG(HAL, Error) << \"Failed to configure camera '\"\n \t\t\t\t<< camera_->id() << \"'\";\n@@ -1905,6 +1903,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t\t}\n \t}\n \n+\tconfig_ = std::move(config);\n \treturn 0;\n }\n \n","prefixes":["libcamera-devel"]}