Title: [90122] trunk/Tools
Revision
90122
Author
[email protected]
Date
2011-06-30 08:30:43 -0700 (Thu, 30 Jun 2011)

Log Message

Robustify PersistentCache against cached data that contains the string ': '

Fixes <http://webkit.org/b/63721> Exceptions thrown while loading TestFailures page due to
passing a bad string to JSON.parse

Reviewed by Darin Adler.

* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/PersistentCache.js:
(PersistentCache._parseDateAndJSONFromString): Manually split the string on the separator
using indexOf and substring. (String.prototype.split always splits on all instances of the
separator.)

Modified Paths

Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/PersistentCache.js (90121 => 90122)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/PersistentCache.js	2011-06-30 15:30:32 UTC (rev 90121)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/PersistentCache.js	2011-06-30 15:30:43 UTC (rev 90122)
@@ -79,10 +79,10 @@
     },
 
     _parseDateAndJSONFromString: function(string) {
-        var components = string.split(this._dateAndJSONSeparator);
+        var separatorIndex = string.indexOf(this._dateAndJSONSeparator);
         return {
-            date: new Date(parseInt(components[0], 10)),
-            json: components[1],
+            date: new Date(parseInt(string.substring(0, separatorIndex), 10)),
+            json: string.substring(separatorIndex + this._dateAndJSONSeparator.length),
         };
     },
 };

Modified: trunk/Tools/ChangeLog (90121 => 90122)


--- trunk/Tools/ChangeLog	2011-06-30 15:30:32 UTC (rev 90121)
+++ trunk/Tools/ChangeLog	2011-06-30 15:30:43 UTC (rev 90122)
@@ -1,5 +1,19 @@
 2011-06-30  Adam Roben  <[email protected]>
 
+        Robustify PersistentCache against cached data that contains the string ': '
+
+        Fixes <http://webkit.org/b/63721> Exceptions thrown while loading TestFailures page due to
+        passing a bad string to JSON.parse
+
+        Reviewed by Darin Adler.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/PersistentCache.js:
+        (PersistentCache._parseDateAndJSONFromString): Manually split the string on the separator
+        using indexOf and substring. (String.prototype.split always splits on all instances of the
+        separator.)
+
+2011-06-30  Adam Roben  <[email protected]>
+
         Include the crashing symbol in crash logs links on TestFailures
 
         Fixes <http://webkit.org/b/63465> Links to crash logs on TestFailures page should include
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to