From d6e9946cdd57a92c9bc86ba97a4ca42078153008 Mon Sep 17 00:00:00 2001 From: Jesse Hall Date: Wed, 28 Sep 2016 11:26:57 -0700 Subject: [PATCH] EGL: check that display is still valid Bug: 31522731 Change-Id: I84d82e55aba5b58dfdbcac9e208c36767fbedfd1 --- opengl/libs/EGL/egl_display.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opengl/libs/EGL/egl_display.cpp b/opengl/libs/EGL/egl_display.cpp index e335a6cc31..1e39aae40d 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() { 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) { -- 2.11.0