Skip to content

src: handle empty MaybeLocal in cjs_lexer::Parse #63885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anonrig wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −7
Open

src: handle empty MaybeLocal in cjs_lexer::Parse #63885

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions src/node_cjs_lexer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ using v8::FunctionCallbackInfo;
using v8::Isolate;
using v8::Local;
using v8::LocalVector;
using v8::MaybeLocal;
using v8::NewStringType;
using v8::Object;
using v8::Set;
Expand All @@ -23,22 +24,20 @@ using v8::Value;

// Create a V8 string from an export_string variant, using fast path for ASCII
template <typename T>
inline Local<String> CreateString(Isolate* isolate, const T& str) {
inline MaybeLocal<String> CreateString(Isolate* isolate, const T& str) {
std::string_view sv = lexer::get_string_view(str);

if (simdutf::validate_ascii(sv.data(), sv.size())) {
return String::NewFromOneByte(isolate,
reinterpret_cast<const uint8_t*>(sv.data()),
NewStringType::kInternalized,
static_cast<int>(sv.size()))
.ToLocalChecked();
static_cast<int>(sv.size()));
}

return String::NewFromUtf8(isolate,
sv.data(),
NewStringType::kInternalized,
static_cast<int>(sv.size()))
.ToLocalChecked();
static_cast<int>(sv.size()));
}

void Parse(const FunctionCallbackInfo<Value>& args) {
Expand Down Expand Up @@ -71,14 +70,22 @@ void Parse(const FunctionCallbackInfo<Value>& args) {
// Convert exports to JS Set
Local<Set> exports_set = Set::New(isolate);
for (const auto& exp : analysis.exports) {
exports_set->Add(context, CreateString(isolate, exp)).ToLocalChecked();
Local<String> exp_str;
if (!CreateString(isolate, exp).ToLocal(&exp_str) ||
exports_set->Add(context, exp_str).IsEmpty()) {
return;
}
}

// Convert reexports to JS array using batch creation
LocalVector<Value> reexports_vec(isolate);
reexports_vec.reserve(analysis.re_exports.size());
for (const auto& reexp : analysis.re_exports) {
reexports_vec.push_back(CreateString(isolate, reexp));
Local<String> reexp_str;
if (!CreateString(isolate, reexp).ToLocal(&reexp_str)) {
return;
}
reexports_vec.push_back(reexp_str);
}

// Create result array [exports (Set), reexports (Array)]
Expand Down
Loading