commit 83f8bba2a5b64e453404d5609c49ba31d5ec5b38
author Jinguang Dong <dongjinguang@huawei.com> Wed Nov 30 06:22:31 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 30 06:22:31 2016 +0000
tree 62d8c93982a5db0592a697ae9559b39c4f20a623
parent f1188685490aae1a670fff038e0e613c861b6cf0
parent 2792ff4527d6b5d033eec7eaed7df08b9783aa1e

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

Change-Id: Ia8c1ac3f9eff3680ed64235cb01043d0b7c434b9

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 8db071e..b4538b3 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -656,6 +656,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();