summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authormaksymsproductengine <maksymsproductengine@lindenlab.com>2013-03-12 00:41:35 +0200
committermaksymsproductengine <maksymsproductengine@lindenlab.com>2013-03-12 00:41:35 +0200
commite7a4cce3566988d5b58dc070196a32844d705318 (patch)
treed4950a15e567451e9ce638cb708a2da7947004ec /indra
parentd81226f1707a93b6be52264fc00cae9c60057cc5 (diff)
CHUI-846 FIXED [crashhunters] crash in LLFontGL::maxDrawableChars
Diffstat (limited to 'indra')
-rw-r--r--indra/llrender/llfontgl.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 647512eb2e..8772779645 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -599,6 +599,11 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch
if(!fgi)
{
fgi = mFontFreetype->getGlyphInfo(wch);
+
+ if (NULL == fgi)
+ {
+ return 0;
+ }
}
// account for glyphs that run beyond the starting point for the next glyphs