Title: [196920] releases/WebKitGTK/webkit-2.10/Source/_javascript_Core
- Revision
- 196920
- Author
- [email protected]
- Date
- 2016-02-22 02:09:27 -0800 (Mon, 22 Feb 2016)
Log Message
Merge r196337 - Don't crash if we fail to parse a builtin
https://bugs.webkit.org/show_bug.cgi?id=154047
rdar://problem/24300617
Reviewed by Mark Lam.
Crashing probably seemed like a good idea at the time, but we could get here in case of a
near stack overflow, so that the parser bails because of recursion.
* parser/Parser.h:
(JSC::parse):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog (196919 => 196920)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog 2016-02-22 10:03:07 UTC (rev 196919)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog 2016-02-22 10:09:27 UTC (rev 196920)
@@ -1,3 +1,17 @@
+2016-02-09 Filip Pizlo <[email protected]>
+
+ Don't crash if we fail to parse a builtin
+ https://bugs.webkit.org/show_bug.cgi?id=154047
+ rdar://problem/24300617
+
+ Reviewed by Mark Lam.
+
+ Crashing probably seemed like a good idea at the time, but we could get here in case of a
+ near stack overflow, so that the parser bails because of recursion.
+
+ * parser/Parser.h:
+ (JSC::parse):
+
2016-02-02 Caitlin Potter <[email protected]>
JSSymbolTableObject::deleteProperty() crashes deleting Symbols
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/parser/Parser.h (196919 => 196920)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/parser/Parser.h 2016-02-22 10:03:07 UTC (rev 196919)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/parser/Parser.h 2016-02-22 10:09:27 UTC (rev 196920)
@@ -1368,8 +1368,8 @@
if (builtinMode == JSParserBuiltinMode::Builtin) {
if (!result)
WTF::dataLog("Error compiling builtin: ", error.message(), "\n");
- RELEASE_ASSERT(result);
- result->setClosedVariables(parser.closedVariables());
+ else
+ result->setClosedVariables(parser.closedVariables());
}
return result;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes