commit 8dd89273e03ce7c906889d26b852ea2493447756
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Sep 26 01:18:02 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 26 01:18:02 2024 +0000
tree 8e6e6a1e4c64e0c5d3aede8df4ce096622340093
parent 12f83cff40f7b75c110a50e1dae40a87c7f893de
parent ab851c755da1652212b99c851571fd0bf2930a6f

Merge "Fix crash in presentation time implementation" into main

opengl/libs/EGL/egl_platform_entries.cpp

diff --git a/opengl/libs/EGL/egl_platform_entries.cpp b/opengl/libs/EGL/egl_platform_entries.cpp
index ca4b129..0bfefd6 100644
--- a/opengl/libs/EGL/egl_platform_entries.cpp
+++ b/opengl/libs/EGL/egl_platform_entries.cpp
@@ -2111,6 +2111,10 @@
     }
 
     egl_surface_t const* const s = get_surface(surface);
+    if (!s->getNativeWindow()) {
+        setError(EGL_BAD_SURFACE, EGL_FALSE);
+        return EGL_FALSE;
+    }
     native_window_set_buffers_timestamp(s->getNativeWindow(), time);
 
     return EGL_TRUE;