diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-11-10 09:08:48 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-11-10 13:55:56 +0100 |
| commit | 2352a8e8e3fee49fbcea1118c5a41cbf4b3998ce (patch) | |
| tree | 8a2515d18fbb39df21123584b92063e317f8d4eb /emfio/source | |
| parent | f80449262e38974b101c4a778c1070285d5a63d1 (diff) | |
ofz#4158 Integer-overflow
Change-Id: I117156abf0e1f52491bf6bbe42bf18f4efd364f7
Reviewed-on: https://gerrit.libreoffice.org/44579
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'emfio/source')
| -rw-r--r-- | emfio/source/reader/wmfreader.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx index 2cb5eeb3f6de..1d0ee83709fc 100644 --- a/emfio/source/reader/wmfreader.cxx +++ b/emfio/source/reader/wmfreader.cxx @@ -526,7 +526,8 @@ namespace emfio case W_META_EXTTEXTOUT: { mpInputStream->SeekRel(-6); - sal_Int32 nRecordPos = mpInputStream->Tell(), nRecordSize = 0; + auto nRecordPos = mpInputStream->Tell(); + sal_Int32 nRecordSize = 0; mpInputStream->ReadInt32( nRecordSize ); mpInputStream->SeekRel(2); Point aPosition = ReadYX(); @@ -567,9 +568,9 @@ namespace emfio if ( nNewTextLen ) { std::unique_ptr<long[]> pDXAry, pDYAry; - sal_uInt32 nMaxStreamPos = nRecordPos + ( nRecordSize << 1 ); - sal_Int32 nDxArySize = nMaxStreamPos - mpInputStream->Tell(); - sal_Int32 nDxAryEntries = nDxArySize >> 1; + auto nMaxStreamPos = nRecordPos + ( nRecordSize << 1 ); + auto nDxArySize = nMaxStreamPos - mpInputStream->Tell(); + auto nDxAryEntries = nDxArySize >> 1; bool bUseDXAry = false; if ( ( ( nDxAryEntries % nOriginalTextLen ) == 0 ) && ( nNewTextLen <= nOriginalTextLen ) ) |