Changeset 225648 in webkit

Timestamp:

Dec 7, 2017 3:30:33 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Fix erroneous ASSERT in DocumentThreadableLoader::didFail
​https://bugs.webkit.org/show_bug.cgi?id=180549

Patch by Youenn Fablet <​youenn@apple.com> on 2017-12-07
Reviewed by Alex Christensen.

• loader/DocumentThreadableLoader.cpp:

(WebCore::DocumentThreadableLoader::didFail): ASSERT was checking whether the optional was null.
This could never be the case since we move the value of the optional, not the optional itself.
Ensure that the optional value is null so that we are sure request is being loaded and make the optional null just after that.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentThreadableLoader.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-12-07  Youenn Fablet  <youenn@apple.com>
+
+        Fix erroneous ASSERT in DocumentThreadableLoader::didFail
+        https://bugs.webkit.org/show_bug.cgi?id=180549
+
+        Reviewed by Alex Christensen.
+
+        * loader/DocumentThreadableLoader.cpp:
+        (WebCore::DocumentThreadableLoader::didFail): ASSERT was checking whether the optional was null.
+        This could never be the case since we move the value of the optional, not the optional itself.
+        Ensure that the optional value is null so that we are sure request is being loaded and make the optional null just after that.
+
 2017-12-07  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp

@@ -411 +411 @@
         m_options.serviceWorkersMode = ServiceWorkersMode::None;
         makeCrossOriginAccessRequestWithPreflight(WTFMove(m_bypassingPreflightForServiceWorkerRequest.value()));
-        ASSERT(!m_bypassingPreflightForServiceWorkerRequest);
+        ASSERT(m_bypassingPreflightForServiceWorkerRequest->isNull());
+        m_bypassingPreflightForServiceWorkerRequest = std::nullopt;
         return;
     }