mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: in Emit(), don't leak converted Arg Local<Values> into caller's scope (#43729)

Browse source 
fix: Emit() should not leak converted arg handles into caller's HandleScope
This commit is contained in:
Charles Kerr 2024-09-17 09:00:52 -05:00 committed by GitHub
parent aa719a4066
commit 5a76655fb8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
shell/common/gin_helper/event_emitter_caller.h
View file

@ -44,11 +44,13 @@ v8::Local<v8::Value> EmitEvent(v8::Isolate* isolate,
v8::Local<v8::Object> obj, v8::Local<v8::Object> obj,
const StringType& name, const StringType& name,
Args&&... args) { Args&&... args) {
v8::EscapableHandleScope scope{isolate};
internal::ValueVector converted_args = { internal::ValueVector converted_args = {
gin::StringToV8(isolate, name), gin::StringToV8(isolate, name),
gin::ConvertToV8(isolate, std::forward<Args>(args))..., gin::ConvertToV8(isolate, std::forward<Args>(args))...,
}; };
return internal::CallMethodWithArgs(isolate, obj, "emit", &converted_args); return scope.Escape(
internal::CallMethodWithArgs(isolate, obj, "emit", &converted_args));
} }
// obj.custom_emit(args...) // obj.custom_emit(args...)
@ -57,11 +59,12 @@ v8::Local<v8::Value> CustomEmit(v8::Isolate* isolate,
v8::Local<v8::Object> object, v8::Local<v8::Object> object,
const char* custom_emit, const char* custom_emit,
Args&&... args) { Args&&... args) {
v8::EscapableHandleScope scope{isolate};
internal::ValueVector converted_args = { internal::ValueVector converted_args = {
gin::ConvertToV8(isolate, std::forward<Args>(args))..., gin::ConvertToV8(isolate, std::forward<Args>(args))...,
}; };
return internal::CallMethodWithArgs(isolate, object, custom_emit, return scope.Escape(internal::CallMethodWithArgs(isolate, object, custom_emit,
&converted_args); &converted_args));
} }
template <typename T, typename... Args> template <typename T, typename... Args>