fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2025-12-26 03:09:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibJS: Check for exception after executing (do)while test expression

Browse Source 
Otherwise we crash the interpreter when an exception is thrown during
evaluation of the while or do/while test expression - which is easily
caused by a ReferenceError - e.g.:

    while (someUndefinedVariable) {
        // ...
    }
This commit is contained in:
Linus Groh
2020-10-23 00:40:14 +01:00
committed by Andreas Kling
parent a19d8aade4
commit 82ac936a9d
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Libraries/LibJS/AST.cpp
View File

@@ -258,9 +258,12 @@ Value IfStatement::execute(Interpreter& interpreter, GlobalObject& global_object
Value WhileStatement::execute(Interpreter& interpreter, GlobalObject& global_object) const
{
Value last_value = js_undefined();
while (m_test->execute(interpreter, global_object).to_boolean()) {
for (;;) {
auto test_result = m_test->execute(interpreter, global_object);
if (interpreter.exception())
return {};
if (!test_result.to_boolean())
break;
last_value = interpreter.execute_statement(global_object, *m_body);
if (interpreter.exception())
return {};
@@ -282,7 +285,7 @@ Value WhileStatement::execute(Interpreter& interpreter, GlobalObject& global_obj
Value DoWhileStatement::execute(Interpreter& interpreter, GlobalObject& global_object) const
{
Value last_value = js_undefined();
do {
for (;;) {
if (interpreter.exception())
return {};
last_value = interpreter.execute_statement(global_object, *m_body);
@@ -298,7 +301,12 @@ Value DoWhileStatement::execute(Interpreter& interpreter, GlobalObject& global_o
return last_value;
}
}
} while (m_test->execute(interpreter, global_object).to_boolean());
auto test_result = m_test->execute(interpreter, global_object);
if (interpreter.exception())
return {};
if (!test_result.to_boolean())
break;
}
return last_value;
}