Title: [231543] branches/safari-605-branch/JSTests
- Revision
- 231543
- Author
- [email protected]
- Date
- 2018-05-08 22:01:19 -0700 (Tue, 08 May 2018)
Log Message
Cherry-pick r230972. rdar://problem/40050818
Gardening: test fix after r230863.
https://bugs.webkit.org/show_bug.cgi?id=184846
<rdar://problem/39390672>
Not reviewed.
* stress/json-stringified-overflow-2.js:
(catch):
* stress/json-stringified-overflow.js:
(catch):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230972 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-605-branch/JSTests/ChangeLog (231542 => 231543)
--- branches/safari-605-branch/JSTests/ChangeLog 2018-05-09 05:01:17 UTC (rev 231542)
+++ branches/safari-605-branch/JSTests/ChangeLog 2018-05-09 05:01:19 UTC (rev 231543)
@@ -1,5 +1,37 @@
2018-05-08 Jason Marcell <[email protected]>
+ Cherry-pick r230972. rdar://problem/40050818
+
+ Gardening: test fix after r230863.
+ https://bugs.webkit.org/show_bug.cgi?id=184846
+ <rdar://problem/39390672>
+
+ Not reviewed.
+
+ * stress/json-stringified-overflow-2.js:
+ (catch):
+ * stress/json-stringified-overflow.js:
+ (catch):
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230972 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-04-24 Mark Lam <[email protected]>
+
+ Gardening: test fix after r230863.
+ https://bugs.webkit.org/show_bug.cgi?id=184846
+ <rdar://problem/39390672>
+
+ Not reviewed.
+
+ * stress/json-stringified-overflow-2.js:
+ (catch):
+ * stress/json-stringified-overflow.js:
+ (catch):
+
+2018-05-08 Jason Marcell <[email protected]>
+
Cherry-pick r230863. rdar://problem/40050818
Handle more JSON stringify OOM
Modified: branches/safari-605-branch/JSTests/stress/json-stringified-overflow-2.js (231542 => 231543)
--- branches/safari-605-branch/JSTests/stress/json-stringified-overflow-2.js 2018-05-09 05:01:17 UTC (rev 231542)
+++ branches/safari-605-branch/JSTests/stress/json-stringified-overflow-2.js 2018-05-09 05:01:19 UTC (rev 231543)
@@ -1,5 +1,10 @@
//@ skip if $memoryLimited
-const s = "a".padStart(0x80000000 - 1);
+
try {
+ const s = "a".padStart(0x80000000 - 1);
JSON.stringify(s);
-} catch (e) {}
+} catch(e) {
+ if (e != "Error: Out of memory")
+ throw e;
+}
+
Modified: branches/safari-605-branch/JSTests/stress/json-stringified-overflow.js (231542 => 231543)
--- branches/safari-605-branch/JSTests/stress/json-stringified-overflow.js 2018-05-09 05:01:17 UTC (rev 231542)
+++ branches/safari-605-branch/JSTests/stress/json-stringified-overflow.js 2018-05-09 05:01:19 UTC (rev 231543)
@@ -1,5 +1,9 @@
//@ skip if $memoryLimited
-const s = "123".padStart(1073741823);
+
try {
+ const s = "123".padStart(1073741823);
JSON.stringify(s);
-} catch (e) {}
+} catch(e) {
+ if (e != "Error: Out of memory")
+ throw e;
+}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
