Title: [294843] branches/safari-613-branch/Source/WebCore
- Revision
- 294843
- Author
- [email protected]
- Date
- 2022-05-25 16:49:50 -0700 (Wed, 25 May 2022)
Log 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
Modified Paths
Diff
Modified: branches/safari-613-branch/Source/WebCore/ChangeLog (294842 => 294843)
--- branches/safari-613-branch/Source/WebCore/ChangeLog 2022-05-25 23:49:47 UTC (rev 294842)
+++ branches/safari-613-branch/Source/WebCore/ChangeLog 2022-05-25 23:49:50 UTC (rev 294843)
@@ -1,5 +1,34 @@
2022-05-19 Alan Coon <[email protected]>
+ 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 <[email protected]>
+
+ 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 <[email protected]>
+
Cherry-pick r293857. rdar://problem/93602013
Remove unnecessary calls to CachedResource::updateBuffer and CachedResource::updateData
Modified: branches/safari-613-branch/Source/WebCore/page/Frame.cpp (294842 => 294843)
--- branches/safari-613-branch/Source/WebCore/page/Frame.cpp 2022-05-25 23:49:47 UTC (rev 294842)
+++ branches/safari-613-branch/Source/WebCore/page/Frame.cpp 2022-05-25 23:49:50 UTC (rev 294843)
@@ -601,7 +601,7 @@
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.
// See https://bugs.webkit.org/show_bug.cgi?id=43704
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
