Title: [290537] trunk/Source/WebCore
- Revision
- 290537
- Author
- [email protected]
- Date
- 2022-02-25 16:27:37 -0800 (Fri, 25 Feb 2022)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (290536 => 290537)
--- trunk/Source/WebCore/ChangeLog 2022-02-26 00:17:25 UTC (rev 290536)
+++ trunk/Source/WebCore/ChangeLog 2022-02-26 00:27:37 UTC (rev 290537)
@@ -1,3 +1,17 @@
+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-02-25 Brent Fulgham <[email protected]>
WebKit continues to render PDF images in Captive Portal mode
Modified: trunk/Source/WebCore/fileapi/FileReaderLoader.cpp (290536 => 290537)
--- trunk/Source/WebCore/fileapi/FileReaderLoader.cpp 2022-02-26 00:17:25 UTC (rev 290536)
+++ trunk/Source/WebCore/fileapi/FileReaderLoader.cpp 2022-02-26 00:27:37 UTC (rev 290537)
@@ -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
