From 95e4d95cdb5152afc547cfb36a905f3f70f34089 Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Thu, 21 Jun 2012 21:25:06 -0500 Subject: [PATCH] Handle case where llOwnerSay() doesn't contain a > or a blank properly. --- indra/newview/fslslbridge.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp index 63ebe54d38..bb34af8ea7 100644 --- a/indra/newview/fslslbridge.cpp +++ b/indra/newview/fslslbridge.cpp @@ -138,7 +138,12 @@ bool FSLSLBridge :: lslToViewer(std::string message, LLUUID fromID, LLUUID owner return false; // quick exit if no leading < S32 closebracket = message.find('>'); S32 firstblank = message.find(' '); - S32 tagend = (closebracket < firstblank) ? closebracket : firstblank; + S32 tagend; + if (closebracket == std::string::npos) + tagend = firstblank; + else if (firstblank == std::string::npos) + tagend = closebracket; + else tagend = (closebracket < firstblank) ? closebracket : firstblank; if (tagend == std::string::npos) return false; std::string tag = message.substr(0,tagend+1);