Title: [290940] branches/safari-613-branch/Source/WebCore
- Revision
- 290940
- Author
- [email protected]
- Date
- 2022-03-07 14:10:29 -0800 (Mon, 07 Mar 2022)
Log Message
Cherry-pick r290537. rdar://problem/89239935
Do not trigger didFail during FileReaderLoader Destruction
https://bugs.webkit.org/show_bug.cgi?id=237060
Patch by Brandon Stewart <[email protected]> on 2022-02-25
Reviewed by Darin Adler.
Setting cancel() instead of terminate() will prevent the didFail() method from being triggered.
This method has the unfortunate side effect of trying to allocate memory, which is not allowed when
under going a sweep event.
* fileapi/FileReaderLoader.cpp:
(WebCore::FileReaderLoader::~FileReaderLoader):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@290537 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613-branch/Source/WebCore/ChangeLog (290939 => 290940)
--- branches/safari-613-branch/Source/WebCore/ChangeLog 2022-03-07 22:10:26 UTC (rev 290939)
+++ branches/safari-613-branch/Source/WebCore/ChangeLog 2022-03-07 22:10:29 UTC (rev 290940)
@@ -1,5 +1,38 @@
2022-03-07 Russell Epstein <[email protected]>
+ Cherry-pick r290537. rdar://problem/89239935
+
+ Do not trigger didFail during FileReaderLoader Destruction
+ https://bugs.webkit.org/show_bug.cgi?id=237060
+
+ Patch by Brandon Stewart <[email protected]> on 2022-02-25
+ Reviewed by Darin Adler.
+
+ Setting cancel() instead of terminate() will prevent the didFail() method from being triggered.
+ This method has the unfortunate side effect of trying to allocate memory, which is not allowed when
+ under going a sweep event.
+
+ * fileapi/FileReaderLoader.cpp:
+ (WebCore::FileReaderLoader::~FileReaderLoader):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@290537 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-02-25 Brandon Stewart <[email protected]>
+
+ Do not trigger didFail during FileReaderLoader Destruction
+ https://bugs.webkit.org/show_bug.cgi?id=237060
+
+ Reviewed by Darin Adler.
+
+ Setting cancel() instead of terminate() will prevent the didFail() method from being triggered.
+ This method has the unfortunate side effect of trying to allocate memory, which is not allowed when
+ under going a sweep event.
+
+ * fileapi/FileReaderLoader.cpp:
+ (WebCore::FileReaderLoader::~FileReaderLoader):
+
+2022-03-07 Russell Epstein <[email protected]>
+
Cherry-pick r290430. rdar://problem/87713597
RELEASE_ASSERT(!renderer()); in WebCore::Node::~Node() + 479 (Node.cpp:366)
Modified: branches/safari-613-branch/Source/WebCore/fileapi/FileReaderLoader.cpp (290939 => 290940)
--- branches/safari-613-branch/Source/WebCore/fileapi/FileReaderLoader.cpp 2022-03-07 22:10:26 UTC (rev 290939)
+++ branches/safari-613-branch/Source/WebCore/fileapi/FileReaderLoader.cpp 2022-03-07 22:10:29 UTC (rev 290940)
@@ -68,7 +68,8 @@
FileReaderLoader::~FileReaderLoader()
{
- terminate();
+ cancel();
+
if (!m_urlForReading.isEmpty())
ThreadableBlobRegistry::unregisterBlobURL(m_urlForReading);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
