[Libreoffice-commits] .: Branch 'libreoffice-3-4' - vcl/unx

Michael Meeks mmeeks at kemper.freedesktop.org
Fri Apr 1 14:26:31 PDT 2011


 vcl/unx/source/gdi/salgdi3.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8b70d97797e27466154151bfd62cebf92571a6fe
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Apr 1 22:25:11 2011 +0100

    fix glyph fallback range crasher with negative nLevel

diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx
index 4365356..3aa1824 100644
--- a/vcl/unx/source/gdi/salgdi3.cxx
+++ b/vcl/unx/source/gdi/salgdi3.cxx
@@ -1238,7 +1238,7 @@ X11SalGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData *pKernPairs )
 sal_Bool X11SalGraphics::GetGlyphBoundRect( long nGlyphIndex, Rectangle& rRect )
 {
     int nLevel = nGlyphIndex >> GF_FONTSHIFT;
-    if( nLevel >= MAX_FALLBACK )
+    if( nLevel < 0 || nLevel >= MAX_FALLBACK )
         return sal_False;
 
     ServerFont* pSF = mpServerFont[ nLevel ];


More information about the Libreoffice-commits mailing list