diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-03-02 09:48:42 +0000 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2017-03-03 16:00:14 +0000 |
commit | 7b64bb4f9421879ad56ba69d3f8dd249eb42d8f0 (patch) | |
tree | 56e7fcf8763db7002667500e54503584c88c104d /filter | |
parent | 46a7fb96273585a83886044d1e86fec7d7bd252b (diff) |
ofz: init vars
Change-Id: Ie35617997845de25af9e528668bce4c332ac408a
(cherry picked from commit 1c29456c9c9007b788297aebea58a1a765f77c84)
Reviewed-on: https://gerrit.libreoffice.org/34785
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.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index a1cd3ab26007..3a9ad60c4d89 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 |