fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-04 00:30:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Never enter dmxDispatch through dmxGetImage as it might be

Browse source 
called when sending a client reply.
This commit is contained in:
David Reveman 2008-11-06 13:52:02 -05:00
parent 51ac918e70
commit 1e560d6adb
1 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
hw/dmx/dmxgcops.c
View file

@ -589,10 +589,9 @@ static DMXScreenInfo *dmxFindAlternatePixmap(DrawablePtr pDrawable, XID *draw)
void dmxGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
unsigned int format, unsigned long planeMask, char *pdstLine)
{
DMXScreenInfo *dmxScreen = &dmxScreens[pDrawable->pScreen->myNum];
Drawable draw;
xcb_get_image_cookie_t cookie;
xcb_get_image_reply_t *reply;
DMXScreenInfo *dmxScreen = &dmxScreens[pDrawable->pScreen->myNum];
Drawable draw;
xcb_get_image_reply_t *reply;
/* Cannot get image from unviewable window */
if (pDrawable->type == DRAWABLE_WINDOW) {
@ -619,22 +618,13 @@ void dmxGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
}
}
cookie = xcb_get_image (dmxScreen->connection,
format,
draw,
sx, sy, w, h,
planeMask);
do {
dmxDispatch ();
if (xcb_poll_for_reply (dmxScreen->connection,
cookie.sequence,
(void **) &reply,
NULL))
break;
} while (dmxWaitForResponse () && dmxScreen->alive);
reply = xcb_get_image_reply (dmxScreen->connection,
xcb_get_image (dmxScreen->connection,
format,
draw,
sx, sy, w, h,
planeMask),
NULL);
if (reply)
{
const xcb_setup_t *setup = xcb_get_setup (dmxScreen->connection);