ofz avoid oom

Change-Id: I7d7e249a75fb33ac6a72e941f6b8f92ff8edf25a

ofz avoid oom
Change-Id: I7d7e249a75fb33ac6a72e941f6b8f92ff8edf25a
b43ad2e6 · Caolán McNamara · 4e63ff0d · b43ad2e6
Kaydet (Commit) b43ad2e6 authored May 09, 2017 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

ww8toolbar.cxx sw/source/filter/ww8/ww8toolbar.cxx +6 -1

No files found.
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -1048,8 +1048,13 @@ bool PlfKme::Read(SvStream &rS)
    nOffSet = rS.Tell();
    Tcg255SubStruct::Read( rS );
    rS.ReadInt32( iMac );
-    if ( iMac )
+    if (iMac > 0)
    {
+        //each Kme is 14 bytes in size
+        size_t nMaxAvailableRecords = rS.remainingSize() / 14;
+        if (static_cast<sal_uInt32>(iMac) > nMaxAvailableRecords)
+            return false;
+
        rgkme.reset( new Kme[ iMac ] );
        for( sal_Int32 index=0; index<iMac; ++index )
        {