Changeset 294843 in webkit

Timestamp:

May 25, 2022, 4:49:50 PM (4 years ago)

Author:

Alan Coon

Message:

Cherry-pick r293922. rdar://problem/93602176

null ptr deref in WebCore::Frame::setPrinting
​https://bugs.webkit.org/show_bug.cgi?id=240173

Reviewed by Wenson Hsieh.

Check m_doc in Frame::setPrinting before access, as it is a RefPtr that can become null.

• page/Frame.cpp: (WebCore::Frame::setPrinting):

Canonical link: ​https://commits.webkit.org/250369@main
git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@293922 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-613-branch/Source/WebCore

Files:

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

branches/safari-613-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2022-05-19  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r293922. rdar://problem/93602176
+
+    null ptr deref in WebCore::Frame::setPrinting
+    https://bugs.webkit.org/show_bug.cgi?id=240173
+    
+    Reviewed by Wenson Hsieh.
+    
+    Check m_doc in Frame::setPrinting before access, as it is a RefPtr that can become null.
+    
+    * page/Frame.cpp:
+    (WebCore::Frame::setPrinting):
+    
+    Canonical link: https://commits.webkit.org/250369@main
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293922 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-05-06  Gabriel Nava Marino  <gnavamarino@apple.com>
+
+            null ptr deref in WebCore::Frame::setPrinting
+            https://bugs.webkit.org/show_bug.cgi?id=240173
+
+            Reviewed by Wenson Hsieh.
+
+            Check m_doc in Frame::setPrinting before access, as it is a RefPtr that can become null.
+
+            * page/Frame.cpp:
+            (WebCore::Frame::setPrinting):
+
 2022-05-19  Alan Coon  <alancoon@apple.com>
 

branches/safari-613-branch/Source/WebCore/page/Frame.cpp

@@ -602 +602 @@
 void Frame::setPrinting(bool printing, const FloatSize& pageSize, const FloatSize& originalPageSize, float maximumShrinkRatio, AdjustViewSizeOrNot shouldAdjustViewSize)
 {
-    if (!view())
+    if (!view() || !document())
         return;
     // In setting printing, we should not validate resources already cached for the document.