diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-12-18 16:09:01 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-12-18 16:09:01 +0000 |
| commit | e0d1211591b1caeff41a5ba6567a052c2c634912 (patch) | |
| tree | 89ddd2fb66727360ab2df03e397054d15501053e /xserver/Xext | |
| parent | 47d9c1404905a4c2796c7fbd12a329751e2e3e97 (diff) | |
Bugfix Update to xserver 1.11.3
Diffstat (limited to 'xserver/Xext')
| -rw-r--r-- | xserver/Xext/saver.c | 3 | ||||
| -rw-r--r-- | xserver/Xext/xvdisp.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/xserver/Xext/saver.c b/xserver/Xext/saver.c index 18886038a..0f9e87870 100644 --- a/xserver/Xext/saver.c +++ b/xserver/Xext/saver.c @@ -927,7 +927,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; @@ -947,7 +947,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/xserver/Xext/xvdisp.c b/xserver/Xext/xvdisp.c index b96843159..84b10b494 100644 --- a/xserver/Xext/xvdisp.c +++ b/xserver/Xext/xvdisp.c @@ -1265,7 +1265,7 @@ ProcXvDispatch(ClientPtr client) UpdateCurrentTime(); - if (stuff->data > xvNumRequests) { + if (stuff->data >= xvNumRequests) { SendErrorToClient(client, XvReqCode, stuff->data, 0, BadRequest); return BadRequest; } @@ -1589,7 +1589,7 @@ SProcXvDispatch(ClientPtr client) UpdateCurrentTime(); - if (stuff->data > xvNumRequests) { + if (stuff->data >= xvNumRequests) { SendErrorToClient(client, XvReqCode, stuff->data, 0, BadRequest); return BadRequest; } |