commit 2da037b416ad30b7d9a7447d17435026ddc77727
author Wonsik Kim <wonsik@google.com> Tue Feb 16 17:49:00 2016 +0900
committer Wonsik Kim <wonsik@google.com> Tue Feb 16 18:15:19 2016 +0900
tree 8d3116ec0c304cbf75add0a7514eb323d004f3f4
parent a69729dc76b97c44387088d351480d5d0701517e

stagefright: add null guard for CameraSource::stopCameraRecording

Bug: 27120259
Change-Id: I2e081404fa4a74b286918374e7da8361c0f59d22

media/libstagefright/CameraSource.cpp

diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp
index d302f82..64d4302 100644
--- a/media/libstagefright/CameraSource.cpp
+++ b/media/libstagefright/CameraSource.cpp
@@ -792,10 +792,14 @@
 void CameraSource::stopCameraRecording() {
     ALOGV("stopCameraRecording");
     if (mCameraFlags & FLAGS_HOT_CAMERA) {
-        mCameraRecordingProxy->stopRecording();
+        if (mCameraRecordingProxy != 0) {
+            mCameraRecordingProxy->stopRecording();
+        }
     } else {
-        mCamera->setListener(NULL);
-        mCamera->stopRecording();
+        if (mCamera != 0) {
+            mCamera->setListener(NULL);
+            mCamera->stopRecording();
+        }
     }
 }