Skip to content

[v6.x backport] vm: backport fix race condition with timeout param #14373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 2 commits into from
Closed

[v6.x backport] vm: backport fix race condition with timeout param #14373

wants to merge 2 commits into from

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

laverdet added 2 commits July 19, 2017 12:17
@laverdet
vm: fix displayErrors in runIn.. functions
53951fb 
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 <anna@addaleax.net>
@laverdet
vm: fix race condition with timeout param
7a175b0 
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 <anna@addaleax.net>
@nodejs-github-bot nodejs-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
@laverdet laverdet mentioned this pull request Jul 19, 2017
Closed
3 tasks
@addaleax addaleax changed the title vm: backport fix race condition with timeout param [v6.x backport] vm: backport fix race condition with timeout param Jul 19, 2017
@addaleax addaleax changed the base branch from v6.x to v6.x-staging July 19, 2017 18:22
MylesBorins pushed a commit that referenced this pull request Jul 21, 2017
@laverdet @MylesBorins
vm: fix displayErrors in runIn.. functions
565c556 
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 <anna@addaleax.net>
MylesBorins pushed a commit that referenced this pull request Jul 21, 2017
@laverdet @MylesBorins
vm: fix race condition with timeout param
8188a52 
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 <anna@addaleax.net>
@MylesBorins
Copy link
Contributor

landed in 97f5806...8188a52

MylesBorins pushed a commit that referenced this pull request Jul 31, 2017
@laverdet @MylesBorins
vm: fix displayErrors in runIn.. functions
6e60c83 
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 <anna@addaleax.net>
MylesBorins pushed a commit that referenced this pull request Jul 31, 2017
@laverdet @MylesBorins
vm: fix race condition with timeout param
8b3aacc 
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 <anna@addaleax.net>
@fhinkel fhinkel mentioned this pull request Aug 3, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jasnell jasnell jasnell approved these changes

@addaleax addaleax addaleax approved these changes

Assignees
No one assigned
Labels
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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@laverdet @MylesBorins @jasnell @addaleax @nodejs-github-bot