You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2012/06/15 11:30:03 UTC
svn commit: r1350553 -
/incubator/ooo/trunk/main/vcl/win/source/gdi/salgdi3.cxx
Author: hdu
Date: Fri Jun 15 09:30:03 2012
New Revision: 1350553
URL: http://svn.apache.org/viewvc?rev=1350553&view=rev
Log:
#i119997# fix a memory leak by WinGlyphFallbackSubstitution"
Patch by: Chao Huang
Found by: Chao Huang
Review by: hdu
Modified:
incubator/ooo/trunk/main/vcl/win/source/gdi/salgdi3.cxx
Modified: incubator/ooo/trunk/main/vcl/win/source/gdi/salgdi3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/win/source/gdi/salgdi3.cxx?rev=1350553&r1=1350552&r2=1350553&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/win/source/gdi/salgdi3.cxx (original)
+++ incubator/ooo/trunk/main/vcl/win/source/gdi/salgdi3.cxx Fri Jun 15 09:30:03 2012
@@ -605,16 +605,20 @@ bool WinGlyphFallbackSubstititution::Fin
if( nTestFontCount > MAX_GFBFONT_COUNT )
nTestFontCount = MAX_GFBFONT_COUNT;
+ bool bFound = false;
for( int i = 0; i < nTestFontCount; ++i )
{
const ImplFontData* pFace = pTestFontList->Get( i );
- if( !HasMissingChars( pFace, rMissingChars ) )
+ bFound = HasMissingChars( pFace, rMissingChars );
+ if( !bFound )
continue;
rFontSelData.maSearchName = pFace->maName;
- return true;
+ break;
}
- return false;
+ delete pTestFontList;
+
+ return bFound;
}
// =======================================================================