diff options
| author | Eric Anholt <[email protected]> | 2011-06-01 13:39:39 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2011-06-03 16:03:34 -0700 |
| commit | 164108e3db5ba09d8e0605f88aa17dab83b68742 (patch) | |
| tree | 011e8477fd69071123934bda52f94b0b7b68b2f1 | |
| parent | 836a595594a5500945c5d97d6f63c245ebbe34a8 (diff) | |
glx: Fix use-before-null-check in dri2InvalidateBuffers().
The compiler used our dereference here to skip the NULL check below.
Fixes window resize in "jconsole -J-Dsun.java2d.opengl=True" under
OpenJDK 6.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=37766
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
| -rw-r--r-- | src/glx/dri2_glx.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index b9f6f7fcf03..69b47ae45e2 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -675,9 +675,14 @@ dri2InvalidateBuffers(Display *dpy, XID drawable) { __GLXDRIdrawable *pdraw = dri2GetGlxDrawableFromXDrawableId(dpy, drawable); - struct dri2_screen *psc = (struct dri2_screen *) pdraw->psc; + struct dri2_screen *psc; struct dri2_drawable *pdp = (struct dri2_drawable *) pdraw; + if (!pdraw) + return; + + psc = (struct dri2_screen *) pdraw->psc; + #if __DRI2_FLUSH_VERSION >= 3 if (pdraw && psc->f && psc->f->base.version >= 3 && psc->f->invalidate) psc->f->invalidate(pdp->driDrawable); |