summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-03-02 09:48:42 +0000
committerMichael Stahl <mstahl@redhat.com>2017-03-03 15:59:23 +0000
commitf96840d17562250aa7ac55f99934ee938008ce0c (patch)
tree33a2d8829c6a89dc46316abcfb263f8a362c137e /filter
parentf8de39789767f58c03b149371388a92722cb0427 (diff)
ofz: init vars
Change-Id: Ie35617997845de25af9e528668bce4c332ac408a (cherry picked from commit 1c29456c9c9007b788297aebea58a1a765f77c84) Reviewed-on: https://gerrit.libreoffice.org/34786 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'filter')
-rw-r--r--filter/source/graphicfilter/ipsd/ipsd.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index 5b68a175844a..b91b8482e98c 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