summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-04-16 13:40:04 +0100
committerMichael Stahl <mstahl@redhat.com>2013-04-16 14:12:46 +0000
commit02da63878e7cfbc85e6bce74e1b7b0fb71a8ebec (patch)
treeeb5c109ef6dc4c6b7b35b43e43837d21d594af29
parent7e2a257febac0b1259ac78b27e71ac2cbc198882 (diff)
Resolves: fdo#47209 and rhbz#927223 syntax highlighter crash
when trying to parse empty lines looking for the matching bracket Change-Id: I3961a3d0e804d136de286e21934c6ba5ab0496cf (cherry picked from commit 02917cb57e2c2e9fcab2db8f72960023f3e4edaf) Reviewed-on: https://gerrit.libreoffice.org/3415 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--svtools/source/edit/editsyntaxhighlighter.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx
index 20749db44fc9..28cbcd5af125 100644
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
+++ b/svtools/source/edit/editsyntaxhighlighter.cxx
@@ -98,6 +98,10 @@ void MultiLineEditSyntaxHighlight::DoBracketHilight(sal_uInt16 aKey)
continue;
String aLine( GetTextEngine()->GetText( aPara ) );
+
+ if (aLine.Len() == 0)
+ continue;
+
for (sal_uInt16 i = ((unsigned long)aPara==nStartPara) ? aStartPos-1 : (sal_uInt16)(aLine.Len()-1); i>0; --i)
{
if (aLine.GetChar(i)==aChar)