Skip to content

Conversation

@laverdet
Copy link
Contributor

This is a backport of PR #13074 for v6.x

  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines
Affected core subsystem(s)

vm

This option has been broken for almost a year when used with any of the vm.runIn.. family of functions, except for syntax errors. PR-URL: nodejs#13074 Reviewed-By: Anna Henningsen <[email protected]>
This fixes a race condition in the watchdog timer used for vm timeouts. The condition would terminate the main stack's execution instead of the code running under the sandbox. PR-URL: nodejs#13074 Reviewed-By: Anna Henningsen <[email protected]>
@nodejs-github-botnodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory. v6.x labels Jul 19, 2017
@addaleaxaddaleax changed the title vm: backport fix race condition with timeout param[v6.x backport] vm: backport fix race condition with timeout paramJul 19, 2017
@addaleaxaddaleax changed the base branch from v6.x to v6.x-stagingJuly 19, 2017 18:22
MylesBorins pushed a commit that referenced this pull request Jul 21, 2017
This option has been broken for almost a year when used with any of the vm.runIn.. family of functions, except for syntax errors. Backport-PR-URL: #14373 PR-URL: #13074 Reviewed-By: Anna Henningsen <[email protected]>
MylesBorins pushed a commit that referenced this pull request Jul 21, 2017
This fixes a race condition in the watchdog timer used for vm timeouts. The condition would terminate the main stack's execution instead of the code running under the sandbox. Backport-PR-URL: #14373 PR-URL: #13074 Reviewed-By: Anna Henningsen <[email protected]>
@MylesBorins
Copy link
Contributor

landed in 97f5806...8188a52

MylesBorins pushed a commit that referenced this pull request Jul 31, 2017
This option has been broken for almost a year when used with any of the vm.runIn.. family of functions, except for syntax errors. Backport-PR-URL: #14373 PR-URL: #13074 Reviewed-By: Anna Henningsen <[email protected]>
MylesBorins pushed a commit that referenced this pull request Jul 31, 2017
This fixes a race condition in the watchdog timer used for vm timeouts. The condition would terminate the main stack's execution instead of the code running under the sandbox. Backport-PR-URL: #14373 PR-URL: #13074 Reviewed-By: Anna Henningsen <[email protected]>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

c++Issues and PRs that require attention from people who are familiar with C++.lib / srcIssues and PRs related to general changes in the lib or src directory.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@laverdet@MylesBorins@jasnell@addaleax@nodejs-github-bot