commit 8a68c3fecde9f688e07784e79ae661f821654453
author Caolán McNamara <caolanm@redhat.com> Sun Nov 16 20:22:09 2014 +0000
committer Caolán McNamara <caolanm@redhat.com> Sun Nov 16 20:46:34 2014 +0000
tree 6399316de813c8cd27fa1cb7a362ebbce368142e
parent 8877a2fbf5b71c45fd8af308884f9f52e34d7e9f

coverity#1242630 reorganize to help coverity out

Change-Id: I18124cd8d7aadbab22114fa9d38607b43862f9ea

svl/source/items/macitem.cxx

diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 24c4cc7..29d27403 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -103,6 +103,11 @@ SvStream& SvxMacroTableDtor::Read( SvStream& rStrm, sal_uInt16 nVersion )

    short nMacro(0);
    rStrm.ReadInt16(nMacro);
    if (nMacro < 0)
    {
        SAL_WARN("editeng", "Parsing error: negative value " << nMacro);
        return rStrm;
    }

    const size_t nMinStringSize = rStrm.GetStreamCharSet() == RTL_TEXTENCODING_UNICODE ? 4 : 2;
    size_t nMinRecordSize = 2 + 2*nMinStringSize;
@@ -110,7 +115,7 @@ SvStream& SvxMacroTableDtor::Read( SvStream& rStrm, sal_uInt16 nVersion )
        nMinRecordSize+=2;

    const size_t nMaxRecords = rStrm.remainingSize() / nMinRecordSize;
    if (nMacro > 0 && static_cast<size_t>(nMacro) > nMaxRecords)
    if (static_cast<size_t>(nMacro) > nMaxRecords)
    {
        SAL_WARN("editeng", "Parsing error: " << nMaxRecords <<
                 " max possible entries, but " << nMacro<< " claimed, truncating");