[Libreoffice-commits] core.git: vcl/headless

[Caolán McNamara (via logerrit)]

 vcl/headless/svpgdi.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 288e02549bed317730eff0d169f6bdb75c8f40ce
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Mar 23 20:02:50 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Mar 24 09:58:02 2020 +0100

    Resolves: tdf#131507 createCairoSurface returns nullptr on failure
    
    Change-Id: I05190a6f280ebbe750dfda56ef27d3362222b95f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90940
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 6a5a7a23bfac..4f80ae366bfd 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -374,7 +374,7 @@ namespace
             unsigned long nTargetWidth = 0,
             unsigned long nTargetHeight = 0) const
         {
-            if(bDisableDownScale || 0 == nTargetWidth || 0 == nTargetHeight || isTrivial())
+            if (bDisableDownScale || 0 == nTargetWidth || 0 == nTargetHeight || !pSurface || isTrivial())
             {
                 // caller asks for original or disabled or trivial (smaller then a minimal square size)
                 // also excludes zero cases for width/height after this point if need to prescale