Merge "Region: Speculative fix for ubsan abort" into pi-dev

1 files changed, 5 insertions, 0 deletions

diff --git a/libs/ui/Region.cpp b/libs/ui/Region.cpp
index 36da084c80..fe4ae6c414 100644
--- a/libs/ui/Region.cpp
+++ b/libs/ui/Region.cpp
@@ -838,6 +838,11 @@ Region::const_iterator Region::begin() const {
 }
 
 Region::const_iterator Region::end() const {
+    // Workaround for b/77643177
+    // mStorage should never be empty, but somehow it is and it's causing
+    // an abort in ubsan
+    if (mStorage.isEmpty()) return mStorage.array();
+
     size_t numRects = isRect() ? 1 : mStorage.size() - 1;
     return mStorage.array() + numRects;
 }