commit 3966c1fda93a004c3302703bde8c231dc1dbcd1f
author Tony Guo <tony.guo.peng@gmail.com> Thu Sep 07 03:46:05 2023 +0000
committer Tony Guo <tony.guo.peng@gmail.com> Thu Sep 07 05:40:44 2023 +0000
tree d1407478cfe6474759b46e0929f1aedfbc79f887
parent 6999bc03e98ddf2950ee1b5485c4c07ab871e74f

Camera: Fix potential null pointer dereference issues

Change-Id: I57a0ecde5665193de4fba3ae116a2553f4685dc9

camera/Camera.cpp

diff --git a/camera/Camera.cpp b/camera/Camera.cpp
index 35b8e21..6b040ab 100644
--- a/camera/Camera.cpp
+++ b/camera/Camera.cpp
@@ -245,7 +245,7 @@
     ALOGV("getParameters");
     String8 params;
     sp <::android::hardware::ICamera> c = mCamera;
-    if (c != 0) params = mCamera->getParameters();
+    if (c != 0) params = c->getParameters();
     return params;
 }
 
@@ -269,7 +269,7 @@
     ALOGV("setPreviewCallbackFlags");
     sp <::android::hardware::ICamera> c = mCamera;
     if (c == 0) return;
-    mCamera->setPreviewCallbackFlag(flag);
+    c->setPreviewCallbackFlag(flag);
 }
 
 status_t Camera::setPreviewCallbackTarget(