From 8f65593786a4302a1ef7c95ce048bd658367a220 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 13 Feb 2018 14:45:09 +0200
Subject: [PATCH] MAINT-8146 Clearing pointers
---
indra/llrender/llfontfreetype.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp
index bd2eef7fd36..ab668dc192d 100644
--- a/indra/llrender/llfontfreetype.cpp
+++ b/indra/llrender/llfontfreetype.cpp
@@ -199,6 +199,7 @@ BOOL LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 v
else
{
delete pFileStream;
+ pFileStream = NULL;
return FALSE;
}
#else
@@ -214,6 +215,8 @@ BOOL LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 v
pFileStream->close();
delete pFileStream;
delete pFtStream;
+ pFileStream = NULL;
+ pFtStream = NULL;
#endif
return FALSE;
}
@@ -229,13 +232,15 @@ BOOL LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 v
if (error)
{
+ // Clean up freetype libs.
+ FT_Done_Face(mFTFace);
#ifdef LL_WINDOWS
pFileStream->close();
delete pFileStream;
delete pFtStream;
+ pFileStream = NULL;
+ pFtStream = NULL;
#endif
- // Clean up freetype libs.
- FT_Done_Face(mFTFace);
mFTFace = NULL;
return FALSE;
}
--
GitLab