commit 66ecc5ef7dd0d31b3a7eebcb232d9bf8a73be682
author Ivan Lozano <ivanlozano@google.com> Wed Dec 20 03:45:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 20 03:45:59 2017 +0000
tree accbf2183825ee307eafbef2673fe2895fc1592a
parent e3d84283f86246baa7a6c603599a27d9bb92b9f4
parent 95e19cda6ea34f26312890a6be2a56279907fa83

Merge "Fix sanitizer in egl_display_t::get."
am: 95e19cda6e

Change-Id: I902304c4877aac7926d30c4fa85ce49320da12cb

opengl/libs/EGL/egl_display.cpp

diff --git a/opengl/libs/EGL/egl_display.cpp b/opengl/libs/EGL/egl_display.cpp
index 4e5833a..3c1edd1 100644
--- a/opengl/libs/EGL/egl_display.cpp
+++ b/opengl/libs/EGL/egl_display.cpp
@@ -79,6 +79,10 @@
 }
 
 egl_display_t* egl_display_t::get(EGLDisplay dpy) {
+    if (uintptr_t(dpy) == 0) {
+        return nullptr;
+    }
+
     uintptr_t index = uintptr_t(dpy)-1U;
     if (index >= NUM_DISPLAYS || !sDisplay[index].isValid()) {
         return nullptr;