commit 981de2fd950af808e8f42a047aeca83687ed2f7b
author Noel Grandin <noel@peralex.com> Mon Apr 13 19:40:14 2020 +0200
committer Noel Grandin <noel.grandin@collabora.co.uk> Mon Apr 13 22:47:32 2020 +0200
tree 6becda2214e0e9885e935af7902fe0002bb1f7f7
parent f2b3a5d28702b4085adbc30ff1431703928e7798

tdf#104878 related, fix abort()

in SkiaCompatibleDC::getImageAsDiff
when loading the larger example file.

We hit the abort because we have a rectangle here
with  width and height -2.

Not sure where that is coming from, because the crash
doesn't happen in debug build, only optimised.

Change-Id: I448b418dee26536d361e82e4d649be447ba43725
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92127
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

vcl/source/gdi/salgdilayout.cxx

diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index fa5656b..16a3080 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -830,7 +830,7 @@
{
    bool bRet = false;
    tools::Rectangle aControlRegion(rControlRegion);
    if (aControlRegion.IsEmpty())
    if (aControlRegion.IsEmpty() || aControlRegion.GetWidth() <= 0 || aControlRegion.GetHeight() <= 0)
        return bRet;

    if( (m_nLayout & SalLayoutFlags::BiDiRtl) || (pOutDev && pOutDev->IsRTLEnabled()) )