Changeset 152380 in webkit

Timestamp:

Jul 3, 2013 4:13:46 PM (11 years ago)

Author:

timothy@apple.com

Message:

Guard remaining calls to decodeURIComponent with a try/catch.

​https://bugs.webkit.org/show_bug.cgi?id=118371

Reviewed by Joseph Pecoraro.

• UserInterface/Main.js:

(WebInspector.displayNameForURL):
(WebInspector.updateWindowTitle):

• UserInterface/Utilities.js:

(arrayResult):
(queryString):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Main.js (modified) (3 diffs)
• UserInterface/Utilities.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2013-07-03  Timothy Hatcher  <timothy@apple.com>
+
+        Guard remaining calls to decodeURIComponent with a try/catch.
+
+        https://bugs.webkit.org/show_bug.cgi?id=118371
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Main.js:
+        (WebInspector.displayNameForURL):
+        (WebInspector.updateWindowTitle):
+        * UserInterface/Utilities.js:
+        (arrayResult):
+        (queryString):
+
 2013-07-03  Jessie Berlin  <jberlin@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Main.js

@@ -358 +358 @@
     if (!urlComponents)
         urlComponents = parseURL(url);
+
     var displayName;
     try {
@@ -364 +365 @@
         displayName = urlComponents.lastPathComponent;
     }
+
     return displayName || WebInspector.displayNameForHost(urlComponents.host) || url;
 }
@@ -378 +380 @@
     console.assert(mainFrame);
 
+    var urlComponents = mainFrame.mainResource.urlComponents;
+
+    var lastPathComponent;
+    try {
+        lastPathComponent = decodeURIComponent(urlComponents.lastPathComponent || "");
+    } catch (e) {
+        lastPathComponent = urlComponents.lastPathComponent;
+    }
+
     // Build a title based on the URL components.
-    var urlComponents = mainFrame.mainResource.urlComponents;
-    if (urlComponents.host && urlComponents.lastPathComponent)
-        var title = this.displayNameForHost(urlComponents.host) + " \u2014 " + decodeURIComponent(urlComponents.lastPathComponent);
+    if (urlComponents.host && lastPathComponent)
+        var title = this.displayNameForHost(urlComponents.host) + " \u2014 " + lastPathComponent;
     else if (urlComponents.host)
         var title = this.displayNameForHost(urlComponents.host);
-    else if (urlComponents.lastPathComponent)
-        var title = decodeURIComponent(urlComponents.lastPathComponent);
+    else if (lastPathComponent)
+        var title = lastPathComponent;
     else
         var title = mainFrame.url;

trunk/Source/WebInspectorUI/UserInterface/Utilities.js

@@ -1171 +1171 @@
     function decode(string)
     {
-        // Replace "+" with " " then decode precent encoded values.
-        return decodeURIComponent(string.replace(/\+/g, " "));
+        try {
+            // Replace "+" with " " then decode precent encoded values.
+            return decodeURIComponent(string.replace(/\+/g, " "));
+        } catch (e) {
+            return string;
+        }
     }