vm: fix crash when setting __proto__ on context's globalThis · nodejs/node@0d0fad8 · GitHub

nodejs / node Public

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

• Code
• Issues 632
• Pull requests 755
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 0d0fad8

Browse filesBrowse the repository at this point in the historyBrowse files

F3n67u

authored and

MoLow

committed

vm: fix crash when setting __proto__ on context's globalThis

PR-URL: #47939 Reviewed-By: Zeyu "Alex" Yang <himself65@outlook.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Darshan Sen <raisinten@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>

1 parent 866ed6a commit 0d0fad8
Copy full SHA for 0d0fad8

2 files changed

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

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src
  • node_contextify.cc
• test/parallel
  • test-vm-set-proto-null-on-globalthis.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/node_contextify.cc‎

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

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

Original file line number	Diff line number	Diff line change
@@ -535,7 +535,8 @@ void ContextifyContext::PropertySetterCallback(
535	535	if (is_declared_on_sandbox &&
536	536	ctx->sandbox()
537	537	->GetOwnPropertyDescriptor(context, property)
538		- .ToLocal(&desc)) {
	538	+ .ToLocal(&desc) &&
	539	+ !desc->IsUndefined()) {
539	540	Environment* env = Environment::GetCurrent(context);
540	541	Local<Object> desc_obj = desc.As<Object>();
541	542

Collapse file

‎test/parallel/test-vm-set-proto-null-on-globalthis.js‎

Copy file name to clipboard

+13Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -0,0 +1,13 @@
	1	+ 'use strict';
	2	+ require('../common');
	3	+
	4	+ // Setting __proto__ on vm context's globalThis should not cause a crash
	5	+ // Regression test for https://github.com/nodejs/node/issues/47798
	6	+
	7	+ const vm = require('vm');
	8	+ const context = vm.createContext();
	9	+
	10	+ const contextGlobalThis = vm.runInContext('this', context);
	11	+
	12	+ // Should not crash.
	13	+ contextGlobalThis.__proto__ = null; // eslint-disable-line no-proto

0 commit comments

Comments

0 (0)