Mesa (master): st/dri: avoid segfault if we can't get a pixmap's buffers
Ben Skeggs
darktama at kemper.freedesktop.org
Mon Oct 5 05:53:20 UTC 2009
Module: Mesa
Branch: master
Commit: d47de5054091a5d1fa9b19687ac80bcdc39a5f8f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d47de5054091a5d1fa9b19687ac80bcdc39a5f8f
Author: Ben Skeggs <bskeggs at redhat.com>
Date: Mon Oct 5 15:51:47 2009 +1000
st/dri: avoid segfault if we can't get a pixmap's buffers
Signed-off-by: Ben Skeggs <bskeggs at redhat.com>
---
src/gallium/state_trackers/dri/dri_drawable.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/gallium/state_trackers/dri/dri_drawable.c b/src/gallium/state_trackers/dri/dri_drawable.c
index 6aafb38..3f8dc8d 100644
--- a/src/gallium/state_trackers/dri/dri_drawable.c
+++ b/src/gallium/state_trackers/dri/dri_drawable.c
@@ -249,6 +249,9 @@ void dri2_set_tex_buffer2(__DRIcontext *pDRICtx, GLint target,
dri_get_buffers(drawable->dPriv);
st_get_framebuffer_surface(drawable->stfb, ST_SURFACE_FRONT_LEFT, &ps);
+ if (!ps)
+ return;
+
st_bind_texture_surface(ps, target == GL_TEXTURE_2D ? ST_TEXTURE_2D :
ST_TEXTURE_RECT, 0, drawable->color_format);
}
More information about the mesa-commit
mailing list