[Libreoffice-commits] core.git: sw/source

Caolán McNamara caolanm at redhat.com
Wed Nov 6 15:45:33 CET 2013


 sw/source/core/text/porexp.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8050da9683e859c59ed0b74b1e040a59b888aeac
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 6 14:45:02 2013 +0000

    don't access past end of string
    
    Change-Id: Ia431f51cb02bbd235cdfe56a8131d7b622e9e311

diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 40eeb2a..8c7a2b1 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -150,7 +150,7 @@ MSHORT SwBlankPortion::MayUnderFlow( const SwTxtFormatInfo &rInf,
         return 0; // Nur noch BlankPortions unterwegs
     // Wenn vor uns ein Blank ist, brauchen wir kein Underflow ausloesen,
     // wenn hinter uns ein Blank ist, brauchen wir kein Underflow weiterreichen
-    if( bUnderFlow && CH_BLANK == rInf.GetTxt()[ nIdx + 1] )
+    if (bUnderFlow && nIdx + 1 < rInf.GetTxt().getLength() && CH_BLANK == rInf.GetTxt()[nIdx + 1])
         return 0;
     if( nIdx && !((SwTxtFormatInfo&)rInf).GetFly() )
     {


More information about the Libreoffice-commits mailing list