[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

[Caolán McNamara]

 sw/source/core/fields/expfld.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit b36afd1ecd098723e3119cba81e172396bf30f45
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jun 4 21:00:13 2015 +0100

    Resolves: tdf#91637 avoid -1 string index
    
    Change-Id: I006040f4589065141310fe2a89b8d2ba3e54ad2c
    (cherry picked from commit 4e96b278965875a95f02993590f30ab5859c1fed)
    Reviewed-on: https://gerrit.libreoffice.org/16089
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 3100363..2fcdc42 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -739,8 +739,11 @@ bool SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, size_t* pP ) const
                 sal_Int32 nNum1 = sNum1.toInt32();
                 nCmp = nNum2 - nNum1;
                 if( 0 == nCmp )
-                    nCmp = rCaseColl.compareString( rTmp2.copy( nFndPos2 ),
-                                                    rTmp1.copy( nFndPos1 ));
+                {
+                    OUString aTmp1 = nFndPos1 != -1 ? rTmp1.copy(nFndPos1) : OUString();
+                    OUString aTmp2 = nFndPos2 != -1 ? rTmp2.copy(nFndPos2) : OUString();
+                    nCmp = rCaseColl.compareString(aTmp2, aTmp1);
+                }
             }
             else
                 nCmp = rColl.compareString( rTmp2, rTmp1 );