summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-12-05 17:07:40 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-12-05 17:07:40 -0500
commitb4e106ec35920fdc7aa3c98d7de1778ed309c906 (patch)
treef5dafea10d2027797c2642be4c13c8c3cb1ff59e /indra
parent95bc798693f77460bda0c20df3e1c389d5c762b8 (diff)
SH-2747 FIX
Diffstat (limited to 'indra')
-rwxr-xr-x[-rw-r--r--]indra/newview/llavatariconctrl.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
index 42e7decec1..b539ac38ed 100644..100755
--- a/indra/newview/llavatariconctrl.cpp
+++ b/indra/newview/llavatariconctrl.cpp
@@ -75,6 +75,9 @@ void LLAvatarIconIDCache::load ()
LLUUID icon_id;
LLDate date;
+ if (line.length()<=uuid_len*2)
+ continue; // short line, bail out to prevent substr calls throwing exception.
+
std::string avatar_id_str = line.substr(0,uuid_len);
std::string icon_id_str = line.substr(uuid_len,uuid_len);