From b4e106ec35920fdc7aa3c98d7de1778ed309c906 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 5 Dec 2011 17:07:40 -0500
Subject: [PATCH] SH-2747 FIX

---
 indra/newview/llavatariconctrl.cpp | 3 +++
 1 file changed, 3 insertions(+)
 mode change 100644 => 100755 indra/newview/llavatariconctrl.cpp

diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
old mode 100644
new mode 100755
index 42e7decec18..b539ac38ed8
--- 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);
 		
-- 
GitLab