frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'airlied/reviewed-fixes'

This commit is contained in:
Keith Packard 2011-12-07 12:42:17 -08:00
parent 22a666f995 98c4a888a4
commit 3ab8ee3247
7 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Xext/saver.c
View File

@ -925,7 +925,7 @@ ScreenSaverSetAttributes (ClientPtr client)
goto bail; goto bail;
} }
/* over allocate for override redirect */ /* over allocate for override redirect */
values = malloc((len + 1) * sizeof (unsigned long)); pAttr->values = values = malloc((len + 1) * sizeof (unsigned long));
if (!values) if (!values)
{ {
ret = BadAlloc; ret = BadAlloc;
@ -945,7 +945,6 @@ ScreenSaverSetAttributes (ClientPtr client)
pAttr->pCursor = NullCursor; pAttr->pCursor = NullCursor;
pAttr->pBackgroundPixmap = NullPixmap; pAttr->pBackgroundPixmap = NullPixmap;
pAttr->pBorderPixmap = NullPixmap; pAttr->pBorderPixmap = NullPixmap;
pAttr->values = values;
/* /*
* go through the mask, checking the values, * go through the mask, checking the values,
* looking up pixmaps and cursors and hold a reference * looking up pixmaps and cursors and hold a reference

4
Xext/xvdisp.c
View File

@ -1238,7 +1238,7 @@ ProcXvDispatch(ClientPtr client)
UpdateCurrentTime(); UpdateCurrentTime();
if (stuff->data > xvNumRequests) { if (stuff->data >= xvNumRequests) {
SendErrorToClient(client, XvReqCode, stuff->data, 0, BadRequest); SendErrorToClient(client, XvReqCode, stuff->data, 0, BadRequest);
return BadRequest; return BadRequest;
} }
@ -1542,7 +1542,7 @@ SProcXvDispatch(ClientPtr client)
UpdateCurrentTime(); UpdateCurrentTime();
if (stuff->data > xvNumRequests) { if (stuff->data >= xvNumRequests) {
SendErrorToClient(client, XvReqCode, stuff->data, 0, BadRequest); SendErrorToClient(client, XvReqCode, stuff->data, 0, BadRequest);
return BadRequest; return BadRequest;
} }

4
Xi/extinit.c
View File

@ -409,7 +409,7 @@ static int
ProcIDispatch(ClientPtr client) ProcIDispatch(ClientPtr client)
{ {
REQUEST(xReq); REQUEST(xReq);
if (stuff->data > ARRAY_SIZE(ProcIVector) || !ProcIVector[stuff->data]) if (stuff->data >= ARRAY_SIZE(ProcIVector) || !ProcIVector[stuff->data])
return BadRequest; return BadRequest;
return (*ProcIVector[stuff->data])(client); return (*ProcIVector[stuff->data])(client);
@ -428,7 +428,7 @@ static int
SProcIDispatch(ClientPtr client) SProcIDispatch(ClientPtr client)
{ {
REQUEST(xReq); REQUEST(xReq);
if (stuff->data > ARRAY_SIZE(SProcIVector) || !SProcIVector[stuff->data]) if (stuff->data >= ARRAY_SIZE(SProcIVector) || !SProcIVector[stuff->data])
return BadRequest; return BadRequest;
return (*SProcIVector[stuff->data])(client); return (*SProcIVector[stuff->data])(client);

1
config/hal.c
View File

@ -348,6 +348,7 @@ device_added(LibHalContext *hal_ctx, const char *udi)
if (!strcasecmp(tmp, ".options") && (!xkb_opts.options)) if (!strcasecmp(tmp, ".options") && (!xkb_opts.options))
xkb_opts.options = strdup(tmp_val); xkb_opts.options = strdup(tmp_val);
} }
free(tmp_val);
} }
} }
} }

6
hw/kdrive/src/kinput.c
View File

@ -2146,12 +2146,6 @@ KdCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)
static void static void
KdCrossScreen(ScreenPtr pScreen, Bool entering) KdCrossScreen(ScreenPtr pScreen, Bool entering)
{ {
#ifndef XIPAQ
if (entering)
KdEnableScreen (pScreen);
else
KdDisableScreen (pScreen);
#endif
} }
int KdCurScreen; /* current event screen */ int KdCurScreen; /* current event screen */

18
hw/xfree86/fbdevhw/fbdevhw.c
View File

@ -506,20 +506,22 @@ fbdevHWSetVideoModes(ScrnInfoPtr pScrn)
pScrn->virtualY = pScrn->display->virtualY; pScrn->virtualY = pScrn->display->virtualY;
for (modename = pScrn->display->modes; *modename != NULL; modename++) { for (modename = pScrn->display->modes; *modename != NULL; modename++) {
for (mode = pScrn->monitor->Modes; mode != NULL; mode = mode->next) for (mode = pScrn->monitor->Modes; mode != NULL; mode = mode->next) {
if (0 == strcmp(mode->name,*modename)) if (0 == strcmp(mode->name,*modename)) {
break; if (fbdevHWSetMode(pScrn, mode, TRUE))
break;
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"\tmode \"%s\" test failed\n", *modename);
}
}
if (NULL == mode) { if (NULL == mode) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO, xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"\tmode \"%s\" not found\n", *modename); "\tmode \"%s\" not found\n", *modename);
continue; continue;
} }
if (!fbdevHWSetMode(pScrn, mode, TRUE)) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"\tmode \"%s\" test failed\n", *modename);
continue;
}
xf86DrvMsg(pScrn->scrnIndex, X_INFO, xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"\tmode \"%s\" ok\n", *modename); "\tmode \"%s\" ok\n", *modename);

1
hw/xfree86/xaa/xaaGC.c
View File

@ -239,6 +239,7 @@ XAADestroyGC(GCPtr pGC)
free(pGCPriv->XAAOps); free(pGCPriv->XAAOps);
free(pGCPriv->DashPattern); free(pGCPriv->DashPattern);
pGCPriv->flags = 0;
(*pGC->funcs->DestroyGC)(pGC); (*pGC->funcs->DestroyGC)(pGC);
XAA_GC_FUNC_EPILOGUE (pGC); XAA_GC_FUNC_EPILOGUE (pGC);