[libcamera-devel,v2,1/2] libcamera: camera: Return -EINVAL if any stream is null while configure()
diff mbox series

Message ID 20200415054503.13108-2-email@uajain.com
State Accepted
Headers show
Series
  • More coverity scan fixes
Related show

Commit Message

Umang Jain April 15, 2020, 5:45 a.m. UTC 
Fail and return the Camera::configure() operation if any
of the stream turns out to be a nullptr even after the
PipelineHandler handler seems to have configured the config
successfully. This prevents a null-dereference below in the
loop.

Pointed out by Coverity DefectId=279069

Signed-off-by: Umang Jain <email@uajain.com>
---
 src/libcamera/camera.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Patch
diff mbox series 

diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp
index 8c3bb2c..9d2607b 100644
--- a/src/libcamera/camera.cpp
+++ b/src/libcamera/camera.cpp
@@ -777,9 +777,12 @@  int Camera::configure(CameraConfiguration *config)
 	p_->activeStreams_.clear();
 	for (const StreamConfiguration &cfg : *config) {
 		Stream *stream = cfg.stream();
-		if (!stream)
+		if (!stream) {
 			LOG(Camera, Fatal)
 				<< "Pipeline handler failed to update stream configuration";
+			p_->activeStreams_.clear();
+			return -EINVAL;
+		}
 
 		stream->configuration_ = cfg;
 		p_->activeStreams_.insert(stream);