src: enhance feature access `CHECK`s during bootstrap · nodejs/node@592d51c · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 633
• Pull requests 757
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 592d51c

Browse filesBrowse the repository at this point in the historyBrowse files

addaleax

authored and

BridgeAR

committed

src: enhance feature access CHECKs during bootstrap

This adds `CHECK`s verifying that bootstrapping has finished before environment variables are accessed or handles/requests are created. The latter complements a pair of existent checks, but fails earlier and thus gives information about the call site, effectively addressing the TODO comment there. PR-URL: #30452 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>

1 parent fba2f9a commit 592d51c
Copy full SHA for 592d51c

4 files changed

+9-1Lines changed: 9 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src
  • handle_wrap.cc
  • node.cc
  • node_env_var.cc
  • req_wrap-inl.h

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/handle_wrap.cc‎

Copy file name to clipboardExpand all lines: src/handle_wrap.cc

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -116,6 +116,7 @@ HandleWrap::HandleWrap(Environment* env,
116	116	handle_(handle) {
117	117	handle_->data = this;
118	118	HandleScope scope(env->isolate());
	119	+ CHECK(env->has_run_bootstrapping_code());
119	120	env->handle_wrap_queue()->PushBack(this);
120	121	}
121	122

Collapse file

‎src/node.cc‎

Copy file name to clipboardExpand all lines: src/node.cc

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -344,7 +344,8 @@ MaybeLocal<Value> Environment::RunBootstrapping() {
344	344
345	345	// Make sure that no request or handle is created during bootstrap -
346	346	// if necessary those should be done in pre-execution.
347		- // TODO(joyeecheung): print handles/requests before aborting
	347	+ // Usually, doing so would trigger the checks present in the ReqWrap and
	348	+ // HandleWrap classes, so this is only a consistency check.
348	349	CHECK(req_wrap_queue()->IsEmpty());
349	350	CHECK(handle_wrap_queue()->IsEmpty());
350	351

Collapse file

‎src/node_env_var.cc‎

Copy file name to clipboardExpand all lines: src/node_env_var.cc

+5Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -272,6 +272,7 @@ Maybe<bool> KVStore::AssignFromObject(Local<Context> context,
272	272	static void EnvGetter(Local<Name> property,
273	273	const PropertyCallbackInfo<Value>& info) {
274	274	Environment* env = Environment::GetCurrent(info);
	275	+ CHECK(env->has_run_bootstrapping_code());
275	276	if (property->IsSymbol()) {
276	277	return info.GetReturnValue().SetUndefined();
277	278	}
@@ -287,6 +288,7 @@ static void EnvSetter(Local<Name> property,
287	288	Local<Value> value,
288	289	const PropertyCallbackInfo<Value>& info) {
289	290	Environment* env = Environment::GetCurrent(info);
	291	+ CHECK(env->has_run_bootstrapping_code());
290	292	// calling env->EmitProcessEnvWarning() sets a variable indicating that
291	293	// warnings have been emitted. It should be called last after other
292	294	// conditions leading to a warning have been met.
@@ -320,6 +322,7 @@ static void EnvSetter(Local<Name> property,
320	322	static void EnvQuery(Local<Name> property,
321	323	const PropertyCallbackInfo<Integer>& info) {
322	324	Environment* env = Environment::GetCurrent(info);
	325	+ CHECK(env->has_run_bootstrapping_code());
323	326	if (property->IsString()) {
324	327	int32_t rc = env->env_vars()->Query(env->isolate(), property.As<String>());
325	328	if (rc != -1) info.GetReturnValue().Set(rc);
@@ -329,6 +332,7 @@ static void EnvQuery(Local<Name> property,
329	332	static void EnvDeleter(Local<Name> property,
330	333	const PropertyCallbackInfo<Boolean>& info) {
331	334	Environment* env = Environment::GetCurrent(info);
	335	+ CHECK(env->has_run_bootstrapping_code());
332	336	if (property->IsString()) {
333	337	env->env_vars()->Delete(env->isolate(), property.As<String>());
334	338	}
@@ -340,6 +344,7 @@ static void EnvDeleter(Local<Name> property,
340	344
341	345	static void EnvEnumerator(const PropertyCallbackInfo<Array>& info) {
342	346	Environment* env = Environment::GetCurrent(info);
	347	+ CHECK(env->has_run_bootstrapping_code());
343	348
344	349	info.GetReturnValue().Set(
345	350	env->env_vars()->Enumerate(env->isolate()));

Collapse file

‎src/req_wrap-inl.h‎

Copy file name to clipboardExpand all lines: src/req_wrap-inl.h

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -10,6 +10,7 @@
10	10	namespace node {
11	11
12	12	ReqWrapBase::ReqWrapBase(Environment* env) {
	13	+ CHECK(env->has_run_bootstrapping_code());
13	14	env->req_wrap_queue()->PushBack(this);
14	15	}
15	16

0 commit comments

Comments

0 (0)