Fixed crash in spellchecking when deleting selections while lagging

2 files changed, 30 insertions, 24 deletions

diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 1d998be..7618985 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -604,21 +604,24 @@ std::vector<S32> LLLineEditor::getMisspelledWordsPositions()
                         {
                                 wordEnd++;
                         }       
-                        //got a word :D
-                        std::string selectedWord(std::string(text.begin(), 
-                                text.end()).substr(wordStart,wordEnd-wordStart));
                         
-                        if(!glggHunSpell->isSpelledRight(selectedWord))
-                        {       
-                                //misspelled word here, and you have just right clicked on it!
-                                //get the center of this word..
-                                //S32 center =  llround( (wordEnd-wordStart)/2 ) + wordStart;
-                                //turn this cursor position into a pixel pos
-                                //center = findPixelNearestPos(center-getCursor());
+                        //got a word? -- MC
+                        if (wordStart != wordEnd)
+                        {
+                                std::string selectedWord(std::string(text.begin(), 
+                                        text.end()).substr(wordStart,wordEnd-wordStart));
+                                
+                                if(!selectedWord.empty() && !glggHunSpell->isSpelledRight(selectedWord))
+                                {       
+                                        //misspelled word here, and you have just right clicked on it!
+                                        //get the center of this word..
+                                        //S32 center =  llround( (wordEnd-wordStart)/2 ) + wordStart;
+                                        //turn this cursor position into a pixel pos
+                                        //center = findPixelNearestPos(center-getCursor());
 
-                                thePosesOfBadWords.push_back(
-                                        wordStart);
-                                thePosesOfBadWords.push_back(wordEnd);
+                                        thePosesOfBadWords.push_back(wordStart);
+                                        thePosesOfBadWords.push_back(wordEnd);
+                                }
                         }
                 }
                 wordEnd++;
@@ -2056,7 +2059,7 @@ void LLLineEditor::drawMisspelled(LLRect background)
                         }
                 }
 
-                if (glggHunSpell->getSpellCheckHighlight())
+                if (!misspellLocations.empty() && glggHunSpell->getSpellCheckHighlight())
                 {
                         for (int i =0; i<(int)misspellLocations.size(); i++)
                         {
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 0cafd4b..963eede 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -527,17 +527,20 @@ std::vector<S32> LLTextEditor::getMisspelledWordsPositions()
                         {
                                 wordEnd++;
                         }       
-                        //got a word :D
-
-                        std::string regText(text.begin(),text.end());
-                        std::string selectedWord(regText.substr(wordStart,wordEnd-wordStart));
                         
-                        if(!glggHunSpell->isSpelledRight(selectedWord))
-                        {       
-                                //misspelled word here, and you have just right clicked on it
+                        //got a word? -- MC
+                        if (wordStart != wordEnd)
+                        {
+                                std::string regText(text.begin(),text.end());
+                                std::string selectedWord(regText.substr(wordStart,wordEnd-wordStart));
+                                
+                                if(!selectedWord.empty() && !glggHunSpell->isSpelledRight(selectedWord))
+                                {       
+                                        //misspelled word here, and you have just right clicked on it
 
-                                thePosesOfBadWords.push_back(wordStart);
-                                thePosesOfBadWords.push_back(wordEnd);
+                                        thePosesOfBadWords.push_back(wordStart);
+                                        thePosesOfBadWords.push_back(wordEnd);
+                                }
                         }
                 }
                 wordEnd++;
@@ -3281,7 +3284,7 @@ void LLTextEditor::drawMisspelled()
                         }
                 }
                 //draw
-                if (glggHunSpell->getSpellCheckHighlight())
+                if (!misspellLocations.empty() && glggHunSpell->getSpellCheckHighlight())
                 {
                         for (int i = 0; i<(int)misspellLocations.size() ;i++)
                         {