commit a8cbd47495b4bbf8977388d371ae9e3a71652639
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 08 21:35:26 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 08 21:35:26 2018 +0000
tree fbdf553dc80e182d04825178e1bbc84644b7f241
parent 3c20b55c28ec77e7a6c8edf834572628d49b2cfa
parent b420b58376fa2689295dd5f89e21ac5479803fda

Merge "libui: improve Region::validate"

libs/ui/Region.cpp

diff --git a/libs/ui/Region.cpp b/libs/ui/Region.cpp
index b53c563..36da084 100644
--- a/libs/ui/Region.cpp
+++ b/libs/ui/Region.cpp
@@ -513,6 +513,12 @@
 
 bool Region::validate(const Region& reg, const char* name, bool silent)
 {
+    if (reg.mStorage.isEmpty()) {
+        ALOGE_IF(!silent, "%s: mStorage is empty, which is never valid", name);
+        // return immediately as the code below assumes mStorage is non-empty
+        return false;
+    }
+
     bool result = true;
     const_iterator cur = reg.begin();
     const_iterator const tail = reg.end();