mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

vm.compileFunction: handle parser errors better

Browse Source
This commit is contained in:
Kai Tamkun
2025-05-14 15:53:41 -07:00
parent b72cf78067
commit be5e817a2c
1 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/bun.js/bindings/NodeVM.cpp
View File

@@ -80,18 +80,55 @@ JSC::JSFunction* constructAnonymousFunction(JSC::JSGlobalObject* globalObject, c
VM& vm = globalObject->vm();
auto throwScope = DECLARE_THROW_SCOPE(vm);
LexicallyScopedFeatures lexicallyScopedFeatures = globalObject->globalScopeExtension() ? TaintedByWithScopeLexicallyScopedFeature : NoLexicallyScopedFeatures;
// First try parsing the code as is without wrapping it in an anonymous function expression.
// This is to reject cases where the user passes in a string like "});(function() {".
if (!args.isEmpty() && args.at(0).isString()) {
ParserError error;
String code = args.at(0).toWTFString(globalObject);
SourceCode sourceCode(
JSC::StringSourceProvider::create(code, sourceOrigin, fileName, sourceTaintOrigin, position, SourceProviderSourceType::Program),
position.m_line.oneBasedInt(), position.m_column.oneBasedInt());
if (!checkSyntax(vm, sourceCode, error)) {
ASSERT(error.isValid());
bool actuallyValid = true;
if (error.type() == ParserError::ErrorType::SyntaxError && error.syntaxErrorType() == ParserError::SyntaxErrorIrrecoverable) {
String message = error.message();
if (message == "Return statements are only valid inside functions.") {
actuallyValid = false;
} else {
const JSToken& token = error.token();
int start = token.m_startPosition.offset;
int end = token.m_endPosition.offset;
if (start >= 0 && start < end) {
StringView tokenView = sourceCode.view().substring(start, end - start);
error = ParserError(ParserError::SyntaxError, ParserError::SyntaxErrorIrrecoverable, token, makeString("Unexpected token '"_s, tokenView, '\''), error.line());
}
}
}
if (actuallyValid) {
auto exception = error.toErrorObject(globalObject, sourceCode, -1);
throwException(globalObject, throwScope, exception);
return nullptr;
}
}
}
// wrap the arguments in an anonymous function expression
int startOffset = 0;
String code = stringifyAnonymousFunction(globalObject, args, throwScope, &startOffset);
EXCEPTION_ASSERT(!!throwScope.exception() == code.isNull());
position.m_column = OrdinalNumber::fromZeroBasedInt(position.m_column.zeroBasedInt());
SourceCode sourceCode(
JSC::StringSourceProvider::create(code, sourceOrigin, fileName, sourceTaintOrigin, position, SourceProviderSourceType::Program),
position.m_line.oneBasedInt(), position.m_column.oneBasedInt());
LexicallyScopedFeatures lexicallyScopedFeatures = globalObject->globalScopeExtension() ? TaintedByWithScopeLexicallyScopedFeature : NoLexicallyScopedFeatures;
ParserError error;
bool isEvalNode = false;
@@ -125,8 +162,7 @@ JSC::JSFunction* constructAnonymousFunction(JSC::JSGlobalObject* globalObject, c
// the code we passed in should be a single expression statement containing a function expression
StatementNode* statement = program->singleStatement();
if (!statement || !statement->isExprStatement()) {
JSToken token;
error = ParserError(ParserError::SyntaxError, ParserError::SyntaxErrorIrrecoverable, token, "Parser error"_s, -1);
error = ParserError(ParserError::SyntaxError, ParserError::SyntaxErrorIrrecoverable, JSToken {}, "Parser error"_s, -1);
auto exception = error.toErrorObject(globalObject, sourceCode, -1);
throwException(globalObject, throwScope, exception);
return nullptr;