diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-01-18 14:24:58 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-01-18 14:24:58 -0800 |
| commit | 6ee627d4c065f3c5aedba4765823a65255679f09 (patch) | |
| tree | 90c43334f5966e792cd9b9438ba2beb60623c43d /indra/newview/llavatariconctrl.cpp | |
| parent | 07294e04983c6c24ec8cd5d589c4a0a8fda87431 (diff) | |
| parent | a1b200878fdc517252506a19f71432ab956086c2 (diff) | |
Pull from viewer-experience
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); |