From d415ba2e8c64e3f8c767fcf56f25a041574704c6 Mon Sep 17 00:00:00 2001 From: Guillaume Melquiond Date: Thu, 18 Oct 2007 11:12:42 +0000 Subject: Fixed double-free of true-type resources. --- ChangeLog | 1 + src/gui/truetypefont.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index eabc1eaf..dbbbf623 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * src/beingmanager.h, src/beingmanager.cpp, src/net/beinghandler.cpp: Removed guess of being type from class number. Factored handler for new beings. + * src/gui/truetypefont.cpp: Fixed double-free of true-type resources. 2007-10-15 Bjørn Lindeijer diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp index 7ef29539..bba268c7 100644 --- a/src/gui/truetypefont.cpp +++ b/src/gui/truetypefont.cpp @@ -82,15 +82,17 @@ class TextChunk static std::list cache; typedef std::list::iterator CacheIterator; +static int fontCounter; TrueTypeFont::TrueTypeFont(const std::string& filename, int size) { - if (!TTF_WasInit() && TTF_Init() == -1) + if (fontCounter == 0 && TTF_Init() == -1) { throw GCN_EXCEPTION("Unable to initialize SDL_ttf: " + std::string(TTF_GetError())); } + ++fontCounter; mFont = TTF_OpenFont(filename.c_str(), size); if (mFont == NULL) @@ -103,8 +105,9 @@ TrueTypeFont::TrueTypeFont(const std::string& filename, int size) TrueTypeFont::~TrueTypeFont() { TTF_CloseFont(mFont); + --fontCounter; - if (TTF_WasInit()) + if (fontCounter == 0) { TTF_Quit(); } -- cgit v1.2.3-70-g09d2