Title: [287630] branches/safari-612-branch/Source/WebCore
- Revision
- 287630
- Author
- repst...@apple.com
- Date
- 2022-01-05 10:21:14 -0800 (Wed, 05 Jan 2022)
Log Message
Cherry-pick r287240. rdar://problem/86026618
Fix pointer to blob data in BlobResourceHandle::readDataSync()
<https://webkit.org/b/234459>
<rdar://86026618>
Reviewed by Chris Dumez.
* platform/network/BlobResourceHandle.cpp:
(WebCore::BlobResourceHandle::readDataSync):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287240 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (287629 => 287630)
--- branches/safari-612-branch/Source/WebCore/ChangeLog 2022-01-05 18:21:12 UTC (rev 287629)
+++ branches/safari-612-branch/Source/WebCore/ChangeLog 2022-01-05 18:21:14 UTC (rev 287630)
@@ -1,5 +1,32 @@
2022-01-05 Russell Epstein <repst...@apple.com>
+ Cherry-pick r287240. rdar://problem/86026618
+
+ Fix pointer to blob data in BlobResourceHandle::readDataSync()
+ <https://webkit.org/b/234459>
+ <rdar://86026618>
+
+ Reviewed by Chris Dumez.
+
+ * platform/network/BlobResourceHandle.cpp:
+ (WebCore::BlobResourceHandle::readDataSync):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287240 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-12-19 David Kilzer <ddkil...@apple.com>
+
+ Fix pointer to blob data in BlobResourceHandle::readDataSync()
+ <https://webkit.org/b/234459>
+ <rdar://86026618>
+
+ Reviewed by Chris Dumez.
+
+ * platform/network/BlobResourceHandle.cpp:
+ (WebCore::BlobResourceHandle::readDataSync):
+
+2022-01-05 Russell Epstein <repst...@apple.com>
+
Cherry-pick r287048. rdar://problem/87125012
Adhere to DisplayList iterator's API contract in MemoryDisplayList::~InMemoryDisplayList()
Modified: branches/safari-612-branch/Source/WebCore/platform/network/BlobResourceHandle.cpp (287629 => 287630)
--- branches/safari-612-branch/Source/WebCore/platform/network/BlobResourceHandle.cpp 2022-01-05 18:21:12 UTC (rev 287629)
+++ branches/safari-612-branch/Source/WebCore/platform/network/BlobResourceHandle.cpp 2022-01-05 18:21:14 UTC (rev 287630)
@@ -379,7 +379,7 @@
int bytesToRead = (length > remaining) ? static_cast<int>(remaining) : length;
if (bytesToRead > m_totalRemainingSize)
bytesToRead = static_cast<int>(m_totalRemainingSize);
- memcpy(buf, item.data().data() + item.offset() + m_currentItemReadSize, bytesToRead);
+ memcpy(buf, item.data().data()->data() + item.offset() + m_currentItemReadSize, bytesToRead);
m_totalRemainingSize -= bytesToRead;
m_currentItemReadSize += bytesToRead;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
