[libcamera-devel] [PATCH] lc-compliance: simple_capture: Handle unsupported roles

Niklas Söderlund niklas.soderlund at ragnatech.se
Wed Apr 14 16:10:14 CEST 2021


It's valid for a camera to return a nullptr if the requested set of
roles can not be satisfied. This is not correctly handled by
lc-compliance which instead crashes, fix this.

Signed-off-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>
---
 src/lc-compliance/simple_capture.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lc-compliance/simple_capture.cpp b/src/lc-compliance/simple_capture.cpp
index 811a6220009654be..64e862a08e3a8221 100644
--- a/src/lc-compliance/simple_capture.cpp
+++ b/src/lc-compliance/simple_capture.cpp
@@ -23,6 +23,9 @@ Results::Result SimpleCapture::configure(StreamRole role)
 {
 	config_ = camera_->generateConfiguration({ role });
 
+	if (!config_)
+		return { Results::Skip, "Role not supported by camera" };
+
 	if (config_->validate() != CameraConfiguration::Valid) {
 		config_.reset();
 		return { Results::Fail, "Configuration not valid" };
-- 
2.31.1



More information about the libcamera-devel mailing list