Changeset 249806 in webkit

Timestamp:

Sep 12, 2019 6:52:59 AM (5 years ago)

Author:

Michael Catanzaro

Message:

Fix accidental copies in NetworkLoadChecker.cpp
​https://bugs.webkit.org/show_bug.cgi?id=199528

Reviewed by Youenn Fablet.

Coverity noticed that we are copying a ResourceRequest and a ContentExtensionResultOrError
in NetworkLoadChecker::checkRequest by mistake, when the intent was to move them as rvalue
references.

• NetworkProcess/NetworkLoadChecker.cpp:

(WebKit::NetworkLoadChecker::checkRequest):

• NetworkProcess/NetworkLoadChecker.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkLoadChecker.cpp (modified) (2 diffs)
• NetworkProcess/NetworkLoadChecker.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-12  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Fix accidental copies in NetworkLoadChecker.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=199528
+
+        Reviewed by Youenn Fablet.
+
+        Coverity noticed that we are copying a ResourceRequest and a ContentExtensionResultOrError
+        in NetworkLoadChecker::checkRequest by mistake, when the intent was to move them as rvalue
+        references.
+
+        * NetworkProcess/NetworkLoadChecker.cpp:
+        (WebKit::NetworkLoadChecker::checkRequest):
+        * NetworkProcess/NetworkLoadChecker.h:
+
 2019-09-12  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp

@@ -226 +226 @@
     ResourceRequest originalRequest = request;
 
-    applyHTTPSUpgradeIfNeeded(WTFMove(request), [this, weakThis = makeWeakPtr(*this), client, handler = WTFMove(handler), originalRequest = WTFMove(originalRequest)](auto request) mutable {
+    applyHTTPSUpgradeIfNeeded(WTFMove(request), [this, weakThis = makeWeakPtr(*this), client, handler = WTFMove(handler), originalRequest = WTFMove(originalRequest)](auto&& request) mutable {
         if (!weakThis)
             return handler({ ResourceError { ResourceError::Type::Cancellation }});
@@ -242 +242 @@
 
 #if ENABLE(CONTENT_EXTENSIONS)
-        this->processContentRuleListsForLoad(WTFMove(request), [this, weakThis = WTFMove(weakThis), handler = WTFMove(handler), originalRequest = WTFMove(originalRequest)](auto result) mutable {
+        this->processContentRuleListsForLoad(WTFMove(request), [this, weakThis = WTFMove(weakThis), handler = WTFMove(handler), originalRequest = WTFMove(originalRequest)](auto&& result) mutable {
             if (!result.has_value()) {
                 ASSERT(result.error().isCancellation());

trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.h

@@ -119 +119 @@
     };
     using ContentExtensionResultOrError = Expected<ContentExtensionResult, WebCore::ResourceError>;
-    using ContentExtensionCallback = CompletionHandler<void(ContentExtensionResultOrError)>;
+    using ContentExtensionCallback = CompletionHandler<void(ContentExtensionResultOrError&&)>;
     void processContentRuleListsForLoad(WebCore::ResourceRequest&&, ContentExtensionCallback&&);
 #endif