commit f3fe700dc25d8a93a36bf1f6bcf4f973349f0c6e
author Jinguang Dong <dongjinguang@huawei.com> Wed Nov 30 06:34:31 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 30 06:34:31 2016 +0000
tree 3ac5caa2e880446aeb60c355a1362d496de832e0
parent 86cd1cad61ba26798a081085e89044026f91214e
parent 60f8850e70287858fde57ad8ebfef73560f4477c

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

Change-Id: I5baca403532b095c89838dd0733439c09c430c16

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();