[X2Go-Commits] [pale-moon] 244/294: Add nullcheck in nsSVGUtils::PaintFrameWithEffects

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch upstream/28.5.0
in repository pale-moon.

commit 964c9830fa956249e5f3f3e30bf5d2d307ca3572
Author: wolfbeast <mcwerewolf at wolfbeast.com>
Date:   Sat Apr 6 22:12:00 2019 +0200

    Add nullcheck in nsSVGUtils::PaintFrameWithEffects
    
    Some SVGs define a mask but an invalid mask frame. Check to make sure
    we have a `maskFrame` that isn't null before trying to use it.
    This resolves #1034
---
 layout/svg/nsSVGUtils.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/layout/svg/nsSVGUtils.cpp b/layout/svg/nsSVGUtils.cpp
index 0bded21..98e5f9b 100644
--- a/layout/svg/nsSVGUtils.cpp
+++ b/layout/svg/nsSVGUtils.cpp
@@ -734,9 +734,12 @@ nsSVGUtils::PaintFrameWithEffects(nsIFrame *aFrame,
     RefPtr<SourceSurface> maskSurface;
 
     if (maskUsage.shouldGenerateMaskLayer) {
-      maskSurface =
-        maskFrame->GetMaskForMaskedFrame(&aContext, aFrame, aTransform,
-                                         maskUsage.opacity, &maskTransform);
+      // Make sure we have a mask frame.
+      if (maskFrame) {
+        maskSurface = 
+          maskFrame->GetMaskForMaskedFrame(&aContext, aFrame, aTransform,
+                                           maskUsage.opacity, &maskTransform);
+      }
 
       if (!maskSurface) {
         // Entire surface is clipped out.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git