commit 14fd3a1e2a7b048be2f3a4638e8b30b596eb080e
author Zhijun He <zhijunhe@google.com> Wed Mar 09 01:05:45 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 09 01:05:45 2016 +0000
tree 4faeccc8459f341d1cdd93b6cd2c532327d3f1c8
parent 6f8975ddb9535b10d5aacdacb442cec571130ef6
parent 431503c11ca9e069584f70b0eef8b858a4a43546

Merge "Camera3Device: fix dereferencing null pointer crash" into nyc-dev

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index ee84ff0..b44cbd2 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -534,9 +534,11 @@
         mOutputStreams[i]->dump(fd,args);
     }
 
-    lines = String8("    Camera3 Buffer Manager:\n");
-    write(fd, lines.string(), lines.size());
-    mBufferManager->dump(fd, args);
+    if (mBufferManager != NULL) {
+        lines = String8("    Camera3 Buffer Manager:\n");
+        write(fd, lines.string(), lines.size());
+        mBufferManager->dump(fd, args);
+    }
 
     lines = String8("    In-flight requests:\n");
     if (mInFlightMap.size() == 0) {