[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/basebmp

[Caolán McNamara]

 include/basebmp/polypolygonrenderer.hxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 93772371096b4caf542146e673a44d8d346a09ab
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 11 16:15:16 2016 +0000

    Resolves: tdf#94392 huge negative Y causes length exception
    
    because this rendering stuff is deleted in later versions
    of LibreOffice and replaced with cairo rendering, just bodge
    this case to give up and go home.
    
    Change-Id: I4e60184b0919dc719edfe223ebb2d8ef684608e8
    Reviewed-on: https://gerrit.libreoffice.org/23154
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/include/basebmp/polypolygonrenderer.hxx b/include/basebmp/polypolygonrenderer.hxx
index 88963ae..3f65365 100644
--- a/include/basebmp/polypolygonrenderer.hxx
+++ b/include/basebmp/polypolygonrenderer.hxx
@@ -161,7 +161,14 @@ namespace basebmp
             return; // really, nothing to do then.
 
         detail::VectorOfVectorOfVertices aGET; // the Global Edge Table
-        aGET.resize( nMaxY - nMinY + 1 );
+        try
+        {
+            aGET.resize( nMaxY - nMinY + 1 );
+        }
+        catch (...)
+        {
+            return;
+        }
 
         sal_uInt32 const nVertexCount(
             detail::setupGlobalEdgeTable( aGET, rPoly, nMinY ) );