Mesa (master): glx: Don't refer to the request buffer outside of {L, Unl}ockDisplay
Adam Jackson
ajax at kemper.freedesktop.org
Wed May 25 10:11:10 UTC 2011
Module: Mesa
Branch: master
Commit: a95ec18549b677b5e9912ca9e2c92df5cfef3b4e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a95ec18549b677b5e9912ca9e2c92df5cfef3b4e
Author: Adam Jackson <ajax at redhat.com>
Date: Wed May 25 06:11:20 2011 -0400
glx: Don't refer to the request buffer outside of {L,Unl}ockDisplay
... because that's not a safe thing to do. The request buffer is shared
storage among all threads, and after UnlockDisplay the 'req' pointer may
point into someone else's request.
NOTE: This is a candidate for the 7.10 branch.
Signed-off-by: Adam Jackson <ajax at redhat.com>
---
src/glx/glx_pbuffer.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/glx/glx_pbuffer.c b/src/glx/glx_pbuffer.c
index ad05d95..5c76c74 100644
--- a/src/glx/glx_pbuffer.c
+++ b/src/glx/glx_pbuffer.c
@@ -375,6 +375,7 @@ CreateDrawable(Display *dpy, struct glx_config *config,
CARD32 *data;
unsigned int i;
CARD8 opcode;
+ GLXDrawable xid;
i = 0;
if (attrib_list) {
@@ -395,7 +396,7 @@ CreateDrawable(Display *dpy, struct glx_config *config,
req->screen = config->screen;
req->fbconfig = config->fbconfigID;
req->window = drawable;
- req->glxwindow = XAllocID(dpy);
+ req->glxwindow = xid = XAllocID(dpy);
req->numAttribs = i;
if (attrib_list)
@@ -404,9 +405,9 @@ CreateDrawable(Display *dpy, struct glx_config *config,
UnlockDisplay(dpy);
SyncHandle();
- CreateDRIDrawable(dpy, config, drawable, req->glxwindow, attrib_list, i);
+ CreateDRIDrawable(dpy, config, drawable, xid, attrib_list, i);
- return req->glxwindow;
+ return xid;
}
More information about the mesa-commit
mailing list