| Index: third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
|
| diff --git a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
|
| index a9aa01e650b5749678a56564d80a243c294be77f..1da2a15cea6ea0f8da7f22aeccd0f90d9cf6f2c0 100644
|
| --- a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
|
| +++ b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
|
| @@ -1157,10 +1157,24 @@ void ResourceFetcher::WarnUnusedPreloads() {
|
|
|
| ArchiveResource* ResourceFetcher::CreateArchive(Resource* resource) {
|
| // Only the top-frame can load MHTML.
|
| - if (!Context().IsMainFrame())
|
| + if (!Context().IsMainFrame()) {
|
| + Context().AddConsoleMessage(
|
| + "Attempted to load a multipart archive into an subframe: " +
|
| + resource->Url().GetString(),
|
| + FetchContext::kLogErrorMessage);
|
| return nullptr;
|
| + }
|
| +
|
| archive_ = MHTMLArchive::Create(resource->Url(), resource->ResourceBuffer());
|
| - return archive_ ? archive_->MainResource() : nullptr;
|
| + if (!archive_) {
|
| + // Log if attempting to load an invalid archive resource.
|
| + Context().AddConsoleMessage(
|
| + "Malformed multipart archive: " + resource->Url().GetString(),
|
| + FetchContext::kLogErrorMessage);
|
| + return nullptr;
|
| + }
|
| +
|
| + return archive_->MainResource();
|
| }
|
|
|
| ResourceTimingInfo* ResourceFetcher::GetNavigationTimingInfo() {
|
|
|