diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-08 09:26:34 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-08 09:26:34 +0100 |
| commit | 5b178ff5a5f0b6e481cf9fd9749eb7ef9581c987 (patch) | |
| tree | a52e6d965bcb5f44858efaf1ab42c7f0a81a573a /xorg-server/Xext | |
| parent | 528f5bd58a139174170c4130c67dca30193c9057 (diff) | |
| download | vcxsrv-5b178ff5a5f0b6e481cf9fd9749eb7ef9581c987.tar.gz vcxsrv-5b178ff5a5f0b6e481cf9fd9749eb7ef9581c987.tar.bz2 vcxsrv-5b178ff5a5f0b6e481cf9fd9749eb7ef9581c987.zip | |
git update glproto libX11 libxcb mesa xserver 8 dec 2011
Diffstat (limited to 'xorg-server/Xext')
| -rw-r--r-- | xorg-server/Xext/saver.c | 3 | ||||
| -rw-r--r-- | xorg-server/Xext/xvdisp.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/xorg-server/Xext/saver.c b/xorg-server/Xext/saver.c index 142758c87..18d5e468d 100644 --- a/xorg-server/Xext/saver.c +++ b/xorg-server/Xext/saver.c @@ -925,7 +925,7 @@ ScreenSaverSetAttributes (ClientPtr client) goto bail; } /* over allocate for override redirect */ - values = malloc((len + 1) * sizeof (unsigned long)); + pAttr->values = values = malloc((len + 1) * sizeof (unsigned long)); if (!values) { ret = BadAlloc; @@ -945,7 +945,6 @@ ScreenSaverSetAttributes (ClientPtr client) pAttr->pCursor = NullCursor; pAttr->pBackgroundPixmap = NullPixmap; pAttr->pBorderPixmap = NullPixmap; - pAttr->values = values; /* * go through the mask, checking the values, * looking up pixmaps and cursors and hold a reference diff --git a/xorg-server/Xext/xvdisp.c b/xorg-server/Xext/xvdisp.c index 364a90cf2..0795a1475 100644 --- a/xorg-server/Xext/xvdisp.c +++ b/xorg-server/Xext/xvdisp.c @@ -1238,7 +1238,7 @@ ProcXvDispatch(ClientPtr client) UpdateCurrentTime(); - if (stuff->data > xvNumRequests) { + if (stuff->data >= xvNumRequests) { SendErrorToClient(client, XvReqCode, stuff->data, 0, BadRequest); return BadRequest; } @@ -1542,7 +1542,7 @@ SProcXvDispatch(ClientPtr client) UpdateCurrentTime(); - if (stuff->data > xvNumRequests) { + if (stuff->data >= xvNumRequests) { SendErrorToClient(client, XvReqCode, stuff->data, 0, BadRequest); return BadRequest; } |