diff options
| author | marha <marha@users.sourceforge.net> | 2010-11-14 21:29:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-11-14 21:29:32 +0000 |
| commit | 3425b16d521b8846b95df2b7d32a548d93341f3b (patch) | |
| tree | fa430e95285d90f990b2d5574dad1e409ba5980c /xorg-server/miext/rootless | |
| parent | 41c64098a90b4e974d5005a1619472f2e8a64ea1 (diff) | |
| download | vcxsrv-3425b16d521b8846b95df2b7d32a548d93341f3b.tar.gz vcxsrv-3425b16d521b8846b95df2b7d32a548d93341f3b.tar.bz2 vcxsrv-3425b16d521b8846b95df2b7d32a548d93341f3b.zip | |
xserver pixman libX11 libXext 14/11/2010
Diffstat (limited to 'xorg-server/miext/rootless')
| -rw-r--r-- | xorg-server/miext/rootless/rootlessScreen.c | 3 | ||||
| -rw-r--r-- | xorg-server/miext/rootless/rootlessWindow.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/xorg-server/miext/rootless/rootlessScreen.c b/xorg-server/miext/rootless/rootlessScreen.c index fd396e464..364a75ac8 100644 --- a/xorg-server/miext/rootless/rootlessScreen.c +++ b/xorg-server/miext/rootless/rootlessScreen.c @@ -92,8 +92,7 @@ RootlessUpdateScreenPixmap(ScreenPtr pScreen) rowbytes = PixmapBytePad(pScreen->width, pScreen->rootDepth);
if (s->pixmap_data_size < rowbytes) {
- if (s->pixmap_data != NULL)
- free(s->pixmap_data);
+ free(s->pixmap_data);
s->pixmap_data_size = rowbytes;
s->pixmap_data = malloc(s->pixmap_data_size);
diff --git a/xorg-server/miext/rootless/rootlessWindow.c b/xorg-server/miext/rootless/rootlessWindow.c index a86020cc5..20fdaba8d 100644 --- a/xorg-server/miext/rootless/rootlessWindow.c +++ b/xorg-server/miext/rootless/rootlessWindow.c @@ -1140,10 +1140,8 @@ FinishFrameResize(WindowPtr pWin, Bool gravity, int oldX, int oldY, }
}
- if (gResizeDeathBits != NULL) {
- free(gResizeDeathBits);
- gResizeDeathBits = NULL;
- }
+ free(gResizeDeathBits);
+ gResizeDeathBits = NULL;
if (gravity) {
pScreen->CopyWindow = gResizeOldCopyWindowProc;
|