diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-06-18 20:39:28 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-06-30 17:35:25 +0100 |
| commit | af2aea40d29dffd5e584432e0652db114113469b (patch) | |
| tree | b78f01a33ab1fe91efd83af4eb8f10d90a84e336 /src/egl/drivers/dri2/platform_x11.c | |
| parent | 4ea5223a95436b76a3f808732c565e9833f84551 (diff) | |
| download | external_mesa3d-af2aea40d29dffd5e584432e0652db114113469b.zip external_mesa3d-af2aea40d29dffd5e584432e0652db114113469b.tar.gz external_mesa3d-af2aea40d29dffd5e584432e0652db114113469b.tar.bz2 | |
egl/x11: handle when invalid drawable is passed in create_surface
0 is not used as a valid drawable id, as such there is no point in
attempting to query its geometry. Just bail out early and provide the
more meaningful EGL_BAD_NATIVE_WINDOW to the user.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Diffstat (limited to 'src/egl/drivers/dri2/platform_x11.c')
| -rw-r--r-- | src/egl/drivers/dri2/platform_x11.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index 0fbf4e4..ad40bd5 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -235,6 +235,10 @@ dri2_x11_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type, dri2_surf->drawable, screen->root, dri2_surf->base.Width, dri2_surf->base.Height); } else { + if (!drawable) { + _eglError(EGL_BAD_NATIVE_WINDOW, "dri2_create_surface"); + goto cleanup_surf; + } dri2_surf->drawable = drawable; } |