Changeset 270998 in webkit

Timestamp:

Dec 18, 2020 5:02:47 PM (19 months ago)

Author:

beidson@apple.com

Message:

Fix some issues with PDFs as <object>.
​https://bugs.webkit.org/show_bug.cgi?id=220024

Reviewed by Tim Horton.

No new tests (Unable to write automated tests)

• WebProcess/Plugins/PDF/PDFPlugin.mm:

(WebKit::dataProviderGetBytesAtPositionCallback):
(WebKit::PDFPlugin::getResourceBytesAtPosition): Set the correct URL.
(WebKit::PDFPlugin::ByteRangeRequest::completeWithAccumulatedData): Try harder to catch mismatches in delivered bytes vs expected bytes.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/PDF/PDFPlugin.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-12-18  Brady Eidson  <beidson@apple.com>
+
+        Fix some issues with PDFs as <object>.
+        https://bugs.webkit.org/show_bug.cgi?id=220024
+
+        Reviewed by Tim Horton.
+
+        No new tests (Unable to write automated tests)
+
+        * WebProcess/Plugins/PDF/PDFPlugin.mm:
+        (WebKit::dataProviderGetBytesAtPositionCallback):
+        (WebKit::PDFPlugin::getResourceBytesAtPosition): Set the correct URL.
+        (WebKit::PDFPlugin::ByteRangeRequest::completeWithAccumulatedData): Try harder to catch mismatches in delivered bytes vs expected bytes.
+
 2020-12-18  Jeff Miller  <jeffm@apple.com>
 

trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm

@@ -786 +786 @@
     RunLoop::main().dispatch([plugin = WTFMove(plugin), position, count, buffer, &dataSemaphore, &bytesProvided] {
         plugin->getResourceBytesAtPosition(count, position, [count, buffer, &dataSemaphore, &bytesProvided](const uint8_t* bytes, size_t bytesCount) {
-            ASSERT_UNUSED(count, bytesCount <= count);
+            RELEASE_ASSERT(bytesCount <= count);
             memcpy(buffer, bytes, bytesCount);
             bytesProvided = bytesCount;
@@ -975 +975 @@
 
     auto resourceRequest = documentLoader->request();
+    resourceRequest.setURL(m_sourceURL);
     resourceRequest.setHTTPHeaderField(HTTPHeaderName::Range, makeString("bytes="_s, position, "-"_s, position + count - 1));
     resourceRequest.setCachePolicy(ResourceRequestCachePolicy::DoNotUseAnyCache);
@@ -1055 +1056 @@
 #endif
 
-    m_completionHandler(m_accumulatedData.data(), m_accumulatedData.size());
+    auto completionSize = m_accumulatedData.size();
+    if (completionSize > m_count) {
+        RELEASE_LOG_ERROR(IncrementalPDF, "PDF byte range request got more bytes back from the server than requested. This is likely due to a misconfigured server. Capping result at the requested number of bytes.");
+        completionSize = m_count;
+    }
+
+    m_completionHandler(m_accumulatedData.data(), completionSize);
 
     // Fold this data into the main data buffer so that if something in its range is requested again (which happens quite often)