diff options
| author | Palmer <palmer@lindenlab.com> | 2010-02-17 17:06:36 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2010-02-17 17:06:36 -0800 |
| commit | e938d055f427275005d538bf09d3b40e0f680d5f (patch) | |
| tree | ae16eaeeefd4103d6d6b4be272a04602a202c268 /indra/llui | |
| parent | 5fd3f8e61c9c37c4cf6a1aabc11f2f9ee710053f (diff) | |
EXT-5309 : prevent infinite loop in LLConsole. Reviewed by Richard
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llconsole.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp index a4f69e7ac1..badbddc3cc 100644 --- a/indra/llui/llconsole.cpp +++ b/indra/llui/llconsole.cpp @@ -300,7 +300,8 @@ void LLConsole::Paragraph::updateLines(F32 screen_width, const LLFontGL* font, b S32 paragraph_offset = 0; //Offset into the paragraph text. // Wrap lines that are longer than the view is wide. - while( paragraph_offset < (S32)mParagraphText.length() ) + while( paragraph_offset < (S32)mParagraphText.length() && + mParagraphText[paragraph_offset] != 0) { S32 skip_chars; // skip '\n' // Figure out if a word-wrapped line fits here. |