Skip to content

Commit

Permalink
src: prevent changing FunctionTemplateInfo after publish
Browse files Browse the repository at this point in the history
Refs https://chromium-review.googlesource.com/c/v8/v8/+/2718147

Fixes an issue where Node.js tries to call SetClassName on a
FunctionTemplate twice in some cases. The above CL made it so that
V8 CHECKs when this occurs. It is fixed by ensuring SetClassName
is only called once.

PR-URL: #46979
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Juan José Arboleda <[email protected]>
Reviewed-By: Minwoo Jung <[email protected]>
Reviewed-By: James M Snell <[email protected]>
  • Loading branch information
codebytere authored and targos committed May 2, 2023
1 parent 9962459 commit bf9a52c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
4 changes: 3 additions & 1 deletion src/histogram.cc
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,8 @@ void HistogramBase::Initialize(IsolateData* isolate_data,
SetConstructorFunction(isolate_data->isolate(),
target,
"Histogram",
GetConstructorTemplate(isolate_data));
GetConstructorTemplate(isolate_data),
SetConstructorFunctionFlag::NONE);
}

BaseObjectPtr<BaseObject> HistogramBase::HistogramTransferData::Deserialize(
Expand All @@ -371,6 +372,7 @@ Local<FunctionTemplate> IntervalHistogram::GetConstructorTemplate(
Isolate* isolate = env->isolate();
tmpl = NewFunctionTemplate(isolate, nullptr);
tmpl->Inherit(HandleWrap::GetConstructorTemplate(env));
tmpl->SetClassName(OneByteString(isolate, "Histogram"));
tmpl->InstanceTemplate()->SetInternalFieldCount(
HistogramBase::kInternalFieldCount);
SetProtoMethodNoSideEffect(isolate, tmpl, "count", GetCount);
Expand Down
7 changes: 5 additions & 2 deletions src/node_messaging.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1496,13 +1496,16 @@ static void InitMessaging(Local<Object> target,
NewFunctionTemplate(isolate, JSTransferable::New);
t->InstanceTemplate()->SetInternalFieldCount(
JSTransferable::kInternalFieldCount);
SetConstructorFunction(context, target, "JSTransferable", t);
t->SetClassName(OneByteString(isolate, "JSTransferable"));
SetConstructorFunction(
context, target, "JSTransferable", t, SetConstructorFunctionFlag::NONE);
}

SetConstructorFunction(context,
target,
env->message_port_constructor_string(),
GetMessagePortConstructorTemplate(env));
GetMessagePortConstructorTemplate(env),
SetConstructorFunctionFlag::NONE);

// These are not methods on the MessagePort prototype, because
// the browser equivalents do not provide them.
Expand Down

0 comments on commit bf9a52c

Please sign in to comment.