diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-04-21 01:58:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-21 01:58:27 +0000 |
| commit | 22a51d03cdd6f0db5f449c46136a29d04181b650 (patch) | |
| tree | 65a56831cfe26d227103d4d0f73f8ccd33920537 | |
| parent | c1b354ba9dc184f10f8e2497bedfe62a7150250a (diff) | |
| parent | f7a2e1ab1077ee3c46a112949a277d3f5041d907 (diff) | |
| download | goldfish-opengl-22a51d03cdd6f0db5f449c46136a29d04181b650.tar.gz | |
Merge "goldfish-opengl: add null check in EGL" am: c684c2937b am: e8fbf9779e am: eb09274e48 am: f7a2e1ab10
Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/2538144
Change-Id: I515759f3468901446664eace2792d927efddd25b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | system/egl/egl.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/system/egl/egl.cpp b/system/egl/egl.cpp index 7e34b7d7..d52d6275 100644 --- a/system/egl/egl.cpp +++ b/system/egl/egl.cpp @@ -2222,6 +2222,9 @@ EGLImageKHR eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EG if (native_buffer->common.version != sizeof(android_native_buffer_t)) setErrorReturn(EGL_BAD_PARAMETER, EGL_NO_IMAGE_KHR); + if (native_buffer->handle == NULL) + setErrorReturn(EGL_BAD_PARAMETER, EGL_NO_IMAGE_KHR); + DEFINE_AND_VALIDATE_HOST_CONNECTION(EGL_FALSE); int format = grallocHelper->getFormat(native_buffer->handle); switch (format) { |