diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-05 14:52:19 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-05 14:52:19 +0000 |
| commit | 6254e74e8b2ff8a2a1e8476a3300a7bdd65b7ad6 (patch) | |
| tree | 02e0d5fd297602d526b582dc527e007fe20a326f /xorg-server/mi | |
| parent | 1d142834bdb30308784a0654a39b7c0de7e37695 (diff) | |
| parent | eaedc21febeadad4cf0e370f5d97e7bdb4470870 (diff) | |
| download | vcxsrv-6254e74e8b2ff8a2a1e8476a3300a7bdd65b7ad6.tar.gz vcxsrv-6254e74e8b2ff8a2a1e8476a3300a7bdd65b7ad6.tar.bz2 vcxsrv-6254e74e8b2ff8a2a1e8476a3300a7bdd65b7ad6.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/mi')
| -rw-r--r-- | xorg-server/mi/micmap.c | 2 | ||||
| -rw-r--r-- | xorg-server/mi/midispcur.c | 10 | ||||
| -rw-r--r-- | xorg-server/mi/mipointer.c | 1 | ||||
| -rw-r--r-- | xorg-server/mi/mispans.c | 2 | ||||
| -rw-r--r-- | xorg-server/mi/mizerline.c | 6 |
5 files changed, 9 insertions, 12 deletions
diff --git a/xorg-server/mi/micmap.c b/xorg-server/mi/micmap.c index a92d4fd6d..ca87a8f20 100644 --- a/xorg-server/mi/micmap.c +++ b/xorg-server/mi/micmap.c @@ -575,6 +575,8 @@ miInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, {
vid = malloc(nvtype * sizeof (VisualID));
if (!vid) {
+ free(depth);
+ free(visual);
free(preferredCVCs);
return FALSE;
}
diff --git a/xorg-server/mi/midispcur.c b/xorg-server/mi/midispcur.c index 3ae157fa3..aebf91d5d 100644 --- a/xorg-server/mi/midispcur.c +++ b/xorg-server/mi/midispcur.c @@ -397,7 +397,6 @@ Bool miDCPutUpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,
int x, int y, unsigned long source, unsigned long mask)
{
- miDCScreenPtr pScreenPriv;
miDCCursorPtr pPriv;
miDCBufferPtr pBuffer;
WindowPtr pWin;
@@ -410,8 +409,7 @@ miDCPutUpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, if (!pPriv)
return FALSE;
}
- pScreenPriv = (miDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
- miDCScreenKey);
+
pWin = pScreen->root;
pBuffer = miGetDCDevice(pDev, pScreen);
@@ -444,14 +442,11 @@ Bool miDCSaveUnderCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
int x, int y, int w, int h)
{
- miDCScreenPtr pScreenPriv;
miDCBufferPtr pBuffer;
PixmapPtr pSave;
WindowPtr pWin;
GCPtr pGC;
- pScreenPriv = (miDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
- miDCScreenKey);
pBuffer = miGetDCDevice(pDev, pScreen);
pSave = pBuffer->pSave;
@@ -478,14 +473,11 @@ Bool miDCRestoreUnderCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
int x, int y, int w, int h)
{
- miDCScreenPtr pScreenPriv;
miDCBufferPtr pBuffer;
PixmapPtr pSave;
WindowPtr pWin;
GCPtr pGC;
- pScreenPriv = (miDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
- miDCScreenKey);
pBuffer = miGetDCDevice(pDev, pScreen);
pSave = pBuffer->pSave;
diff --git a/xorg-server/mi/mipointer.c b/xorg-server/mi/mipointer.c index e8ed106ea..5a1528197 100644 --- a/xorg-server/mi/mipointer.c +++ b/xorg-server/mi/mipointer.c @@ -602,7 +602,6 @@ miPointerSetPosition(DeviceIntPtr pDev, int mode, int *x, int *y) pScreen = newScreen;
(*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen,
FALSE);
- pScreenPriv = GetScreenPrivate (pScreen);
/* Smash the confine to the new screen */
pPointer->limits.x2 = pScreen->width;
pPointer->limits.y2 = pScreen->height;
diff --git a/xorg-server/mi/mispans.c b/xorg-server/mi/mispans.c index 4202c9bb9..b7f05a032 100644 --- a/xorg-server/mi/mispans.c +++ b/xorg-server/mi/mispans.c @@ -458,6 +458,8 @@ void miFillUniqueSpanGroup(DrawablePtr pDraw, GCPtr pGC, SpanGroup *spanGroup) }
free(yspans);
free(ysizes);
+ free(newpoints);
+ free(newwidths);
miDisposeSpanGroup (spanGroup);
return;
}
diff --git a/xorg-server/mi/mizerline.c b/xorg-server/mi/mizerline.c index d37e1cc96..709e93422 100644 --- a/xorg-server/mi/mizerline.c +++ b/xorg-server/mi/mizerline.c @@ -157,9 +157,11 @@ miZeroLine( list_len = (height >= width) ? height : width;
pspanInit = malloc(list_len * sizeof(DDXPointRec));
pwidthInit = malloc(list_len * sizeof(int));
- if (!pspanInit || !pwidthInit)
+ if (!pspanInit || !pwidthInit) {
+ free(pspanInit);
+ free(pwidthInit);
return;
-
+ }
Nspans = 0;
new_span = TRUE;
spans = pspanInit - 1;
|