commit 2792ff4527d6b5d033eec7eaed7df08b9783aa1e
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 30 06:11:21 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 30 06:11:22 2016 +0000
tree 9334f7578740b19587590fcffe7531efdd1ac8c4
parent b29c82b67e05c9093d2accfa23e6007dc601f96b
parent 9f8b9ae2a95eec78e676a11a719deafea4952190

Merge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test"

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index dd5b034..45fe6a7 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -646,6 +646,10 @@
 }
 
 int SurfaceFlinger::getActiveConfig(const sp<IBinder>& display) {
+    if (display == NULL) {
+        ALOGE("%s : display is NULL", __func__);
+        return BAD_VALUE;
+    }
     sp<DisplayDevice> device(getDisplayDevice(display));
     if (device != NULL) {
         return device->getActiveConfig();