Title: [148897] trunk/Source/_javascript_Core
- Revision
- 148897
- Author
- [email protected]
- Date
- 2013-04-22 11:21:10 -0700 (Mon, 22 Apr 2013)
Log Message
2013-04-22 Oliver Hunt <[email protected]>
Perform null check before trying to use the result of readline()
RS=Gavin
* jsc.cpp:
(runInteractive):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (148896 => 148897)
--- trunk/Source/_javascript_Core/ChangeLog 2013-04-22 18:19:06 UTC (rev 148896)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-04-22 18:21:10 UTC (rev 148897)
@@ -1,5 +1,14 @@
2013-04-22 Oliver Hunt <[email protected]>
+ Perform null check before trying to use the result of readline()
+
+ RS=Gavin
+
+ * jsc.cpp:
+ (runInteractive):
+
+2013-04-22 Oliver Hunt <[email protected]>
+
Fix assertions to account for new Vector layout
RS=Gavin
Modified: trunk/Source/_javascript_Core/jsc.cpp (148896 => 148897)
--- trunk/Source/_javascript_Core/jsc.cpp 2013-04-22 18:19:06 UTC (rev 148896)
+++ trunk/Source/_javascript_Core/jsc.cpp 2013-04-22 18:21:10 UTC (rev 148897)
@@ -621,14 +621,15 @@
do {
error = ParserError();
char* line = readline(source.isEmpty() ? interactivePrompt : "... ");
+ shouldQuit = !line;
+ if (!line)
+ break;
source = source + line;
source = source + '\n';
checkSyntax(globalObject->globalExec(), makeSource(source, interpreterName), error);
- shouldQuit = !line;
- if (!line || !line[0])
+ if (!line[0])
break;
- if (line[0])
- add_history(line);
+ add_history(line);
} while (error.m_syntaxErrorType == ParserError::SyntaxErrorRecoverable);
if (error.m_type != ParserError::ErrorNone) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
