Skip to content
This repository was archived by the owner on Jul 24, 2024. It is now read-only.

Commit 338fd7a

Browse files
authored
Merge pull request from GHSA-f6rp-gv58-9cw3
1 parent c6f2e5a commit 338fd7a

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

src/custom_importer_bridge.cpp

+8-7
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ SassImportList CustomImporterBridge::post_process_return_value(v8::Local<v8::Val
1313
imports = sass_make_import_list(array->Length());
1414

1515
for (size_t i = 0; i < array->Length(); ++i) {
16-
v8::Local<v8::Value> value = Nan::Get(array, static_cast<uint32_t>(i)).ToLocalChecked();
16+
v8::Local<v8::Value> value;
17+
Nan::MaybeLocal<v8::Value> unchecked = Nan::Get(array, static_cast<uint32_t>(i));
1718

18-
if (!value->IsObject()) {
19-
auto entry = sass_make_import_entry(0, 0, 0);
20-
sass_import_set_error(entry, "returned array must only contain object literals", -1, -1);
19+
if (!unchecked.ToLocal(&value) || !value->IsObject()) {
20+
imports[i] = sass_make_import_entry(0, 0, 0);
21+
sass_import_set_error(imports[i], "returned array must only contain object literals", -1, -1);
2122
continue;
2223
}
2324

@@ -71,9 +72,9 @@ Sass_Import* CustomImporterBridge::check_returned_string(Nan::MaybeLocal<v8::Val
7172
}
7273

7374
Sass_Import* CustomImporterBridge::get_importer_entry(const v8::Local<v8::Object>& object) const {
74-
auto returned_file = Nan::Get(object, Nan::New<v8::String>("file").ToLocalChecked());
75-
auto returned_contents = Nan::Get(object, Nan::New<v8::String>("contents").ToLocalChecked()).ToLocalChecked();
76-
auto returned_map = Nan::Get(object, Nan::New<v8::String>("map").ToLocalChecked());
75+
Nan::MaybeLocal<v8::Value> returned_file = Nan::Get(object, Nan::New<v8::String>("file").ToLocalChecked());
76+
Nan::MaybeLocal<v8::Value> returned_contents = Nan::Get(object, Nan::New<v8::String>("contents").ToLocalChecked());
77+
Nan::MaybeLocal<v8::Value> returned_map = Nan::Get(object, Nan::New<v8::String>("map").ToLocalChecked());
7778
Sass_Import *err;
7879

7980
if ((err = check_returned_string(returned_file, "returned value of `file` must be a string")))

0 commit comments

Comments
 (0)