From patchwork Thu Oct 7 09:39:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 14070 X-Patchwork-Delegate: umang.jain@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 2CAEDBDC71 for ; Thu, 7 Oct 2021 09:39:48 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9FE68691B9; Thu, 7 Oct 2021 11:39:47 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Cvk36Mv9"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CC52F69189 for ; Thu, 7 Oct 2021 11:39:46 +0200 (CEST) Received: from perceval.ideasonboard.com (unknown [103.251.226.190]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A8266DDE; Thu, 7 Oct 2021 11:39:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1633599586; bh=7aw5OjdueBFi74xC4ec818woSNWqy6Wp7mOAIPYG3D4=; h=From:To:Cc:Subject:Date:From; b=Cvk36Mv99sZSVex/oHu1NEmf3eM0Kd2fLjJwWpNajpqnSE/QsvwedGoLnc5F8nclK dZtONW+XcgvL6B+8FnEmdsDJw6qGauKrJxQxc5hbGfjqnHlKX5yWW1Hz1bTPZfFaGG U4W33PtBMfidPYi15g8kKsYtFnmGsa2J2s6ZfIRE= From: Umang Jain To: libcamera-devel@lists.libcamera.org Date: Thu, 7 Oct 2021 15:09:36 +0530 Message-Id: <20211007093937.121357-1-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/2] android: mm: Null check for CameraBufferManager X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" 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 Reviewed-by: Hirokazu Honda Reviewed-by: Laurent Pinchart --- 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..97a04c68 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, Error) + << "Failed to get cros CameraBufferManager instance"; + return; + } int ret = bufferManager_->Register(camera3Buffer); if (ret) {