Changeset 274675 in webkit

Timestamp:

Mar 18, 2021, 3:09:49 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Protect frame before calling setPrinting
​https://bugs.webkit.org/show_bug.cgi?id=222664

Patch by Rob Buis <​rbuis@igalia.com> on 2021-03-18
Reviewed by Ryosuke Niwa.

Protect frame before calling setPrinting
since it could potentially delete the frame
through event handling.

• page/PrintContext.cpp:

(WebCore::PrintContext::begin):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/PrintContext.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-18  Rob Buis  <rbuis@igalia.com>
+
+        Protect frame before calling setPrinting
+        https://bugs.webkit.org/show_bug.cgi?id=222664
+
+        Reviewed by Ryosuke Niwa.
+
+        Protect frame before calling setPrinting
+        since it could potentially delete the frame
+        through event handling.
+
+        * page/PrintContext.cpp:
+        (WebCore::PrintContext::begin):
+
 2021-03-18  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/page/PrintContext.cpp

@@ -192 +192 @@
         return;
 
-    auto& frame = *this->frame();
+    auto frame = makeRef(*this->frame());
     // This function can be called multiple times to adjust printing parameters without going back to screen mode.
     m_isPrinting = true;
 
     FloatSize originalPageSize = FloatSize(width, height);
-    FloatSize minLayoutSize = frame.resizePageRectsKeepingRatio(originalPageSize, FloatSize(width * minimumShrinkFactor(), height * minimumShrinkFactor()));
+    FloatSize minLayoutSize = frame->resizePageRectsKeepingRatio(originalPageSize, FloatSize(width * minimumShrinkFactor(), height * minimumShrinkFactor()));
 
     // This changes layout, so callers need to make sure that they don't paint to screen while in printing mode.
-    frame.setPrinting(true, minLayoutSize, originalPageSize, maximumShrinkFactor() / minimumShrinkFactor(), AdjustViewSize);
+    frame->setPrinting(true, minLayoutSize, originalPageSize, maximumShrinkFactor() / minimumShrinkFactor(), AdjustViewSize);
 }