From 701266653c7a4b5cb0213e6a6003f0aea0401f6b Mon Sep 17 00:00:00 2001
From: Umang Jain <umang.jain@ideasonboard.com>
Date: Thu, 7 Oct 2021 15:09:36 +0530
Subject: android: mm: Null check for CameraBufferManager

cros::CameraBufferManager can be nullptr if there is an error in
its creation. Place a null-check guard to check it.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/android/mm/cros_camera_buffer.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/android/mm/cros_camera_buffer.cpp b/src/android/mm/cros_camera_buffer.cpp
index 86770135..2ac3dc4a 100644
--- a/src/android/mm/cros_camera_buffer.cpp
+++ b/src/android/mm/cros_camera_buffer.cpp
@@ -60,6 +60,11 @@ CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer,
 	  registered_(false)
 {
 	bufferManager_ = cros::CameraBufferManager::GetInstance();
+	if (!bufferManager_) {
+		LOG(HAL, Fatal)
+			<< "Failed to get cros CameraBufferManager instance";
+		return;
+	}
 
 	int ret = bufferManager_->Register(camera3Buffer);
 	if (ret) {
-- 
cgit v1.2.1