commit d45fdc3420e498cd1e300d92697f860bed62c475
author Greg Kaiser <gkaiser@google.com> Tue Apr 30 13:14:19 2019
committer Greg Kaiser <gkaiser@google.com> Wed May 01 11:55:16 2019
tree 21cfd79021fdac8eb5c6d6fabf15e470d68aa76e
parent b511836cadc95b20422b8d223456214738941d94

SurfaceComposerClient: Fix potential null de-reference in detachChildren

We return from the function when we know the pointer is null to
avoid dereferencing it.

Test: TreeHugger
Change-Id: I487b71ba185a48b505719a14b38b8a60283e10a7

libs/gui/SurfaceComposerClient.cpp

diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index a0ed940..01bfe2a 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -1051,6 +1051,7 @@
     layer_state_t* s = getLayerState(sc);
     if (!s) {
         mStatus = BAD_INDEX;
+        return *this;
     }
     s->what |= layer_state_t::eDetachChildren;