From 36e01e698beb8b5703f5d68f5b2eb9494e11a571 Mon Sep 17 00:00:00 2001
From: Tero Toivola <ext-tero.toivola@nokia.com>
Date: Tue, 3 May 2011 14:14:40 +0200
Subject: memory leak fix

If glyph is not found from glyphSet it is created dynamically and
in this case not deleted.

Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=244326

Merge-request: 1208
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
---
 src/gui/text/qfontengine_ft.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index e89b508..9c90964 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -1800,10 +1800,12 @@ glyph_metrics_t QFontEngineFT::boundingBox(glyph_t glyph, const QTransform &matr
     } else {
         glyphSet = &defaultGlyphSet;
     }
+    bool needsDelete = false;
     Glyph * g = glyphSet->getGlyph(glyph);
     if (!g) {
         face = lockFace();
         g = loadGlyphMetrics(glyphSet, glyph);
+        needsDelete = true;
     }
 
     if (g) {
@@ -1812,6 +1814,8 @@ glyph_metrics_t QFontEngineFT::boundingBox(glyph_t glyph, const QTransform &matr
         overall.width = g->width;
         overall.height = g->height;
         overall.xoff = g->advance;
+        if (needsDelete)
+            delete g;
     } else {
         int left  = FLOOR(face->glyph->metrics.horiBearingX);
         int right = CEIL(face->glyph->metrics.horiBearingX + face->glyph->metrics.width);
-- 
cgit v0.12