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

Caolán McNamara caolanm at redhat.com
Wed Nov 6 14:44:18 CET 2013


 filter/source/msfilter/util.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d4d56060eeba4dd78c518e4e1728396efab67962
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 6 13:43:28 2013 +0000

    make WW8ReadFieldParams::GetResult safe
    
    as shown by kde239121-4.doc
    
    Change-Id: I60356e7d76cc271869079f2fffa00e149274a8cc

diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 5646e23..828d5de 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -490,7 +490,7 @@ OUString WW8ReadFieldParams::GetResult() const
         return OUString();
     else
     {
-        return nSavPtr == -1 ? aData.copy(nFnd) : aData.copy(nFnd, nSavPtr-nFnd);
+        return nSavPtr < nFnd ? aData.copy(nFnd) : aData.copy(nFnd, nSavPtr-nFnd);
     }
 }
 


More information about the Libreoffice-commits mailing list