From b2cc8a2f57333f8aa818a7eb519124ce4594b8a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Date: Wed, 14 Apr 2021 15:47:27 +0200 Subject: lc-compliance: simple_capture: Handle unsupported roles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Kieran Bingham Tested-by: Nícolas F. R. A. Prado --- src/lc-compliance/simple_capture.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/lc-compliance') diff --git a/src/lc-compliance/simple_capture.cpp b/src/lc-compliance/simple_capture.cpp index 811a6220..64e862a0 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" }; -- cgit v1.2.1