[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - basegfx/source

[Caolán McNamara]

 basegfx/source/tools/unotools.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 59cc966c33b4a7929f4c9d738a66187b87a3695e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 8 20:58:24 2015 +0000

    asan: global-buffer-overflow on fdo55736-1.docx
    
    throws on master, be more conservative here
    
    (cherry picked from commit 6b084f0001fc15112bf3c40d20a0c7096c83b7fe)
    
    Change-Id: If69a57aa9ff011cc670f868cb87b3a1c4d904435
    Reviewed-on: https://gerrit.libreoffice.org/13817
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/basegfx/source/tools/unotools.cxx b/basegfx/source/tools/unotools.cxx
index f5b1e273..c3e10b4 100644
--- a/basegfx/source/tools/unotools.cxx
+++ b/basegfx/source/tools/unotools.cxx
@@ -52,7 +52,10 @@ namespace unotools
         {
             const sal_Int32 nInnerSequenceCount(pInnerSequence->getLength());
 
-            if(pInnerSequenceFlags->getLength() != nInnerSequenceCount)
+            if (!nInnerSequenceCount)
+                break;
+
+            if (pInnerSequenceFlags->getLength() != nInnerSequenceCount)
                 throw lang::IllegalArgumentException();
 
             // prepare new polygon