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

Eike Rathke erack at redhat.com
Mon Mar 30 12:35:12 PDT 2015


 formula/source/ui/dlg/FormulaHelper.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eed393039a9067f7a1a318934ff1c5ff90bfe443
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Mar 30 21:29:46 2015 +0200

    Resolves: tdf#90301 string access out of bounds
    
    Apparently yet another leftover of UniString to OUString conversion
    where with UniString out-of-bounds accesses didn't harm and returned
    NIL.
    
    Change-Id: Id88456a52df3fc8cdaf90d9d509e327b96269808

diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index 73ef782..fe78f3a 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -201,7 +201,7 @@ sal_Int32 FormulaHelper::GetFunctionStart( const OUString&   rFormula,
         return nStart;
 
     sal_Int32  nFStart = FUNC_NOTFOUND;
-    sal_Int32  nParPos = nStart;
+    sal_Int32  nParPos = bBack ? ::std::min( nStart, nStrLen - 1) : nStart;
 
     bool bRepeat;
     do


More information about the Libreoffice-commits mailing list