diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-02-02 10:57:09 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-02-02 10:57:09 -0500 |
| commit | b9376ab990707aafb041ef630d321b886bed6128 (patch) | |
| tree | 75cb218be1507c60d79ed543a13ca6bcae1d6e54 /indra/newview/llavatariconctrl.cpp | |
| parent | b0d94fa706efd7794b4ba5b9160ddcfc33233ca4 (diff) | |
| parent | 0e609cc95b08c28bd51f5ab48160fd93df7a6b28 (diff) | |
merge
Diffstat (limited to 'indra/newview/llavatariconctrl.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llavatariconctrl.cpp | 3 |
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); |