[X2Go-Commits] [pale-moon] 12/24: Add nullcheck for frames in FindNearestCommonAncestorFrame

git-admin at x2go.org git-admin at x2go.org
Thu Apr 25 09:06:07 CEST 2019


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

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

commit 181cb5210e6555102f5215316ea7a9b1771b0717
Author: wolfbeast <mcwerewolf at wolfbeast.com>
Date:   Mon Feb 18 22:24:29 2019 +0100

    Add nullcheck for frames in FindNearestCommonAncestorFrame
    
    This resolves #978.
---
 layout/base/nsLayoutUtils.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index f0341f9..07befdc 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -2681,6 +2681,10 @@ nsLayoutUtils::GetTransformToAncestorScaleExcludingAnimated(nsIFrame* aFrame)
 nsIFrame*
 nsLayoutUtils::FindNearestCommonAncestorFrame(nsIFrame* aFrame1, nsIFrame* aFrame2)
 {
+  if (!aFrame1 || !aFrame2) {
+    return nullptr;
+  }
+
   AutoTArray<nsIFrame*,100> ancestors1;
   AutoTArray<nsIFrame*,100> ancestors2;
   nsIFrame* commonAncestor = nullptr;

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


More information about the x2go-commits mailing list