Merge "Fix crash in presentation time implementation" into main

Treehugger Robot · Gerrit Code Review · commit 8dd89273e03c · 2024-09-26T01:18:02.000Z
diff --git a/opengl/libs/EGL/egl_platform_entries.cpp b/opengl/libs/EGL/egl_platform_entries.cpp
@@ -2111,6 +2111,10 @@ EGLBoolean eglPresentationTimeANDROIDImpl(EGLDisplay dpy, EGLSurface surface,
     }
 
     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;

Original file line number	Diff line number	Diff line change
`@@ -2111,6 +2111,10 @@ EGLBoolean eglPresentationTimeANDROIDImpl(EGLDisplay dpy, EGLSurface surface,`
`2111`	`2111`	`}`
`2112`	`2112`
`2113`	`2113`	`egl_surface_t const* const s = get_surface(surface);`
	`2114`	`+ if (!s->getNativeWindow()) {`
	`2115`	`+ setError(EGL_BAD_SURFACE, EGL_FALSE);`
	`2116`	`+ return EGL_FALSE;`
	`2117`	`+ }`
`2114`	`2118`	`native_window_set_buffers_timestamp(s->getNativeWindow(), time);`
`2115`	`2119`
`2116`	`2120`	`return EGL_TRUE;`