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

Caolán McNamara caolanm at redhat.com
Mon Jan 5 03:46:27 PST 2015


 tools/source/stream/stream.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a623b0df102aa4530cd46322f03806dfaf267f6e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 5 11:33:31 2015 +0000

    valgrind: Conditional jump or move depends on uninitialised value
    
    Change-Id: Id5125052b49e322cdfa2c7d55d68e8a7a512965c
    (cherry picked from commit bd03af56780aae3159dac8e40ee937824be3e906)

diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index e320f6f..00cd17e 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -810,7 +810,7 @@ bool SvStream::StartReadingUnicodeText( rtl_TextEncoding eReadBomCharSet )
         return true;    // nothing to read
 
     bool bTryUtf8 = false;
-    sal_uInt16 nFlag;
+    sal_uInt16 nFlag(0);
     sal_sSize nBack = sizeof(nFlag);
     this->ReadUInt16( nFlag );
     switch ( nFlag )
@@ -847,7 +847,7 @@ bool SvStream::StartReadingUnicodeText( rtl_TextEncoding eReadBomCharSet )
     }
     if (bTryUtf8)
     {
-        unsigned char nChar;
+        unsigned char nChar(0);
         nBack += sizeof(nChar);
         this->ReadUChar( nChar );
         if (nChar == 0xbf)


More information about the Libreoffice-commits mailing list