Changeset 286747 in webkit

Timestamp:

Dec 8, 2021, 4:05:55 PM (5 years ago)

Author:

BJ Burg

Message:

Web Inspector: evaluateScriptForExtension() incorrectly unwraps internal errors, causing an ASSERT
​https://bugs.webkit.org/show_bug.cgi?id=233961
<rdar://86123763>

Reviewed by Patrick Angle.

Standardize the unwrapping code based on the evaluateScriptInExtensionTab version, which
correctly handles the case where an internal error is returned by the evaluation.
This happens, for example, when NotImplemented is returned for unsupported evaluation
options.

This particular issue was caused by a lack of support for the 'frameURL' option.
The fix for that is tracked by ​https://webkit.org/b/222568/.

• WebProcess/Inspector/WebInspectorUIExtensionController.cpp:

(WebKit::WebInspectorUIExtensionController::evaluateScriptForExtension):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Inspector/WebInspectorUIExtensionController.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-12-08  BJ Burg  <bburg@apple.com>
+
+        Web Inspector: evaluateScriptForExtension() incorrectly unwraps internal errors, causing an ASSERT
+        https://bugs.webkit.org/show_bug.cgi?id=233961
+        <rdar://86123763>
+
+        Reviewed by Patrick Angle.
+
+        Standardize the unwrapping code based on the evaluateScriptInExtensionTab version, which
+        correctly handles the case where an internal error is returned by the evaluation.
+        This happens, for example, when NotImplemented is returned for unsupported evaluation
+        options.
+
+        This particular issue was caused by a lack of support for the 'frameURL' option.
+        The fix for that is tracked by https://webkit.org/b/222568/.
+
+        * WebProcess/Inspector/WebInspectorUIExtensionController.cpp:
+        (WebKit::WebInspectorUIExtensionController::evaluateScriptForExtension):
+
 2021-12-08  J Pascoe  <j_pascoe@apple.com>
 

trunk/Source/WebKit/WebProcess/Inspector/WebInspectorUIExtensionController.cpp

@@ -251 +251 @@
 
         if (auto parsedError = weakThis->parseExtensionErrorFromEvaluationResult(result)) {
-            auto exceptionDetails = result.value().error();
-            LOG(Inspector, "Internal error encountered while evaluating upon the frontend: at %s:%d:%d: %s", exceptionDetails.sourceURL.utf8().data(), exceptionDetails.lineNumber, exceptionDetails.columnNumber, exceptionDetails.message.utf8().data());
+            if (!result.value().has_value()) {
+                auto exceptionDetails = result.value().error();
+                LOG(Inspector, "Internal error encountered while evaluating upon the frontend at %s:%d:%d: %s", exceptionDetails.sourceURL.utf8().data(), exceptionDetails.lineNumber, exceptionDetails.columnNumber, exceptionDetails.message.utf8().data());
+            } else
+                LOG(Inspector, "Internal error encountered while evaluating upon the frontend: %s", extensionErrorToString(parsedError.value()).utf8().data());
+
             completionHandler({ }, std::nullopt, parsedError);
             return;
@@ -260 +264 @@
         auto objectResult = weakThis->unwrapEvaluationResultAsObject(result);
         if (!objectResult) {
-            LOG(Inspector, "Unexpected non-object value returned from InspectorFrontendAPI.createTabForExtension().");
+            LOG(Inspector, "Unexpected non-object value returned from InspectorFrontendAPI.evaluateScriptForExtension().");
             completionHandler({ }, std::nullopt, Inspector::ExtensionError::InternalError);
             return;