[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - vcl/generic

Michael Meeks michael.meeks at collabora.com
Sat Jan 4 06:54:02 PST 2014


 vcl/generic/glyphs/glyphcache.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6d5dd3da0750ab10d5a875a3b4ab31550b1634ee
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Sat Jan 4 14:47:20 2014 +0000

    fdo#73280 - always advance the iterator to avoid an infinite loop.
    
    Change-Id: I62f2d8ec5d6d62f1dbe9657cfbbbc90c56cce812

diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
index 2cda76f..5ac5510 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -374,6 +374,8 @@ void ServerFont::GarbageCollect( long nMinLruIndex )
             GlyphCache::GetInstance().RemovingGlyph( rGD );
             it = maGlyphList.erase( it );
         }
+        else
+            ++it;
     }
 }
 


More information about the Libreoffice-commits mailing list