commit 3169437feb387b56499208464960d281bd9b87c9
author Jesse Hall <jessehall@google.com> Wed Sep 28 23:01:38 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 28 23:01:38 2016 +0000
tree 1aa725546deee933622fca1df5fef6d6f78e62e2
parent 0627130b28c7f0eafbf9c2b062ff0c662a8c73a5
parent d6e9946cdd57a92c9bc86ba97a4ca42078153008

EGL: check that display is still valid
am: d6e9946cdd

Change-Id: I6d5f5e6f4790f16c1bd52f96743c7e138973a1b4

opengl/libs/EGL/egl_display.cpp

diff --git a/opengl/libs/EGL/egl_display.cpp b/opengl/libs/EGL/egl_display.cpp
index e335a6c..1e39aae 100644
--- a/opengl/libs/EGL/egl_display.cpp
+++ b/opengl/libs/EGL/egl_display.cpp
@@ -66,7 +66,10 @@
 
 egl_display_t* egl_display_t::get(EGLDisplay dpy) {
     uintptr_t index = uintptr_t(dpy)-1U;
-    return (index >= NUM_DISPLAYS) ? NULL : &sDisplay[index];
+    if (index >= NUM_DISPLAYS || !sDisplay[index].isValid()) {
+        return nullptr;
+    }
+    return &sDisplay[index];
 }
 
 void egl_display_t::addObject(egl_object_t* object) {