Crashfix/sanity on Octopus

2011-04-16 02:09:49 +02:00
parent ef43a87ac0
commit 68a95b5b1a
1 changed files with 8 additions and 0 deletions
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3077,7 +3077,15 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 								avatar->clearNameFromChat();
 						}
 					} else {
+						if (key.isNull()) {
+							llwarns << "Nameplate from chat on NULL avatar (ignored)" << llendl;
+							return;
+						}	
 						LLVOAvatar *avatar = gObjectList.findAvatar(key);
+						if (!avatar) {
+							llwarns << "Nameplate from chat on invalid avatar (ignored)" << llendl;
+							return;							
+						}
 						if (mesg.size() == 39) {
 							avatar->clearNameFromChat();
 						} else if (mesg[39] == ' ') {