commit 06d5e3590eb23144dd9de567663633160ba39302
author Fabien Sanglard <sanglardf@google.com> Thu Mar 30 16:27:02 2017 -0700
committer Fabien Sanglard <sanglardf@google.com> Sat Apr 01 13:28:11 2017 -0700
tree 16ecb45c3c79d8388aa014a96a96ddb800b4dbb9
parent 34ca5f2ab8cc891957567915def5bc32a36e6d82

[libadapter] Fix nullpointer in acceptchanges

Check the layer still exists upon accepting changes.

Bug: 36205238
Test: AUPT
Change-Id: I8443265ecc7b8b0a12347439fd75b138d14c7e3a

libs/hwc2on1adapter/HWC2On1Adapter.cpp

diff --git a/libs/hwc2on1adapter/HWC2On1Adapter.cpp b/libs/hwc2on1adapter/HWC2On1Adapter.cpp
index 03297ca..e35bfc9 100644
--- a/libs/hwc2on1adapter/HWC2On1Adapter.cpp
+++ b/libs/hwc2on1adapter/HWC2On1Adapter.cpp
@@ -538,6 +538,12 @@
     for (auto& change : mChanges->getTypeChanges()) {
         auto layerId = change.first;
         auto type = change.second;
+        if (mDevice.mLayers.count(layerId) == 0) {
+            // This should never happen but somehow does.
+            ALOGW("Cannot accept change for unknown layer (%" PRIu64 ")",
+                  layerId);
+            continue;
+        }
         auto layer = mDevice.mLayers[layerId];
         layer->setCompositionType(type);
     }