[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/tocread.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 84e15f7b570a7c86e694f6f1bf3029c8fd04caa6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 10 14:07:38 2015 +0000

    avoid divide by zero
    
    Change-Id: I7d6502c752a7b9f39f94d5cddd5f44240e0b6d04
    (cherry picked from commit 92b936e3ef947cc096b1445455332625900c3024)

diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx
index e829add..192a636 100644
--- a/lotuswordpro/source/filter/tocread.cxx
+++ b/lotuswordpro/source/filter/tocread.cxx
@@ -118,6 +118,8 @@ CBenTOCReader::ReadLabel(unsigned long * pTOCOffset, unsigned long * pTOCSize)
     assert(Flags == 0x0101 || Flags == 0x0);
 
     cBlockSize = UtGetIntelWord(pCurrLabel) * 1024; pCurrLabel += 2;
+    if (cBlockSize == 0)
+        return BenErr_NotBentoContainer;
 
     // Check major version
     if (UtGetIntelWord(pCurrLabel) != BEN_CURR_MAJOR_VERSION)