[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - filter/source

[Caolán McNamara]

 filter/source/graphicfilter/ipsd/ipsd.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit f96840d17562250aa7ac55f99934ee938008ce0c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 2 09:48:42 2017 +0000

    ofz: init vars
    
    Change-Id: Ie35617997845de25af9e528668bce4c332ac408a
    (cherry picked from commit 1c29456c9c9007b788297aebea58a1a765f77c84)
    Reviewed-on: https://gerrit.libreoffice.org/34786
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index 5b68a17..b91b848 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -279,17 +279,17 @@ bool PSDReader::ImplReadHeader()
     // this is a loop over the resource entries to get the resolution info
     while( m_rPSD.Tell() < nLayerPos )
     {
-        sal_uInt8 n8;
-        sal_uInt32 nType, nPStringLen, nResEntryLen;
-        sal_uInt16 nUniqueID;
-
-        m_rPSD.ReadUInt32( nType ).ReadUInt16( nUniqueID ).ReadUChar( n8 );
-        nPStringLen = n8;
-        if ( nType != 0x3842494d )
+        sal_uInt32 nType(0);
+        sal_uInt16 nUniqueID(0);
+        sal_uInt8 n8(0);
+        m_rPSD.ReadUInt32(nType).ReadUInt16(nUniqueID).ReadUChar(n8);
+        if (nType != 0x3842494d)
             break;
+        sal_uInt32 nPStringLen = n8;
         if ( ! ( nPStringLen & 1 ) )
             nPStringLen++;
         m_rPSD.SeekRel( nPStringLen );  // skipping the pstring
+        sal_uInt32 nResEntryLen(0);
         m_rPSD.ReadUInt32( nResEntryLen );
         if ( nResEntryLen & 1 )
             nResEntryLen++;             // the resource entries are padded