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

Tor Lillqvist tml at iki.fi
Fri Feb 22 11:12:20 PST 2013


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

New commits:
commit fb1991e7c1b17bd4e3b5e0f9aa572d958eb243f4
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Feb 22 21:04:29 2013 +0200

    WaE: ´nLen´ may be used uninitialized in this function
    
    Looking at the change to this line in e904749eb8e1109f9a884b309fad6de5f78ad623
    , I think this line was changed incorrectly. So I won't simply "fix" the
    warninig by initialising nLen to some value like zero, but instead reinstate
    the use of the nCharCount2 here instead of nLen.
    
    Change-Id: Ice4a5cb751a244c38b3cfc4e05e3206cb939484a

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 373e909..99f662c 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -5195,7 +5195,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con
                 }
                 else
                 {
-                    aCharPropSet.maString = aString.copy(nCharAnzRead, nLen);
+                    aCharPropSet.maString = aString.copy(nCharAnzRead, nCharCount);
                     aCharPropList.push_back( new PPTCharPropSet( aCharPropSet, nCurrentPara ) );
                     nCharAnzRead += nCharCount;
                     bEmptyParaPossible = sal_False;


More information about the Libreoffice-commits mailing list