diff options
| author | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-10-18 11:12:42 +0000 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-01-05 22:17:26 -0700 |
| commit | 97fb7026570f60bd3286c27e6049e19f08baa35e (patch) | |
| tree | 96513d3b9f955ea2f9cce332a622f35745d03be3 /src | |
| parent | 12c742f538bd24b8d25b4fe971c7eef507c3b4c9 (diff) | |
| download | mana-97fb7026570f60bd3286c27e6049e19f08baa35e.tar.gz mana-97fb7026570f60bd3286c27e6049e19f08baa35e.tar.bz2 mana-97fb7026570f60bd3286c27e6049e19f08baa35e.tar.xz mana-97fb7026570f60bd3286c27e6049e19f08baa35e.zip | |
Fixed double-free of true-type resources.
(cherry-picked from mainline)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/truetypefont.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp index bf95ca37..3986cca5 100644 --- a/src/gui/truetypefont.cpp +++ b/src/gui/truetypefont.cpp @@ -82,15 +82,17 @@ class TextChunk static std::list<TextChunk> cache; typedef std::list<TextChunk>::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(); } |