yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a possible pixmap leak.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=826826
This commit is contained in:
Luboš Luňák 2008-07-01 14:51:38 +00:00
parent e99c489ffe
commit 2bae5f1f4b
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
composite.cpp
View file

@ -478,7 +478,7 @@ Pixmap Toplevel::createWindowPixmap()
assert( compositing()); assert( compositing());
grabXServer(); grabXServer();
KXErrorHandler err; KXErrorHandler err;
window_pix = XCompositeNameWindowPixmap( display(), frameId()); Pixmap pix = XCompositeNameWindowPixmap( display(), frameId());
// check that the received pixmap is valid and actually matches what we // check that the received pixmap is valid and actually matches what we
// know about the window (i.e. size) // know about the window (i.e. size)
XWindowAttributes attrs; XWindowAttributes attrs;
@ -489,8 +489,13 @@ Pixmap Toplevel::createWindowPixmap()
if( attrs.width != width() || attrs.height != height() || attrs.map_state != IsViewable ) if( attrs.width != width() || attrs.height != height() || attrs.map_state != IsViewable )
window_pix = None; window_pix = None;
ungrabXServer(); ungrabXServer();
if( window_pix == None ) if( window_pix == None || pix == None )
{
kDebug( 1212 ) << "Creating window pixmap failed: " << this; kDebug( 1212 ) << "Creating window pixmap failed: " << this;
if( pix != None )
XFreePixmap( display(), pix );
}
window_pix = pix;
return window_pix; return window_pix;
#else #else
return None; return None;