archive/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2025-08-15 21:58:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

async_hooks: prevent sync methods of async storage exiting outer context

Browse source 
PR-URL: https://github.com/nodejs/node/pull/31950
Reviewed-By: Vladimir de Turckheim <vlad2t@hotmail.com>
Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>
This commit is contained in:
Stephen Belanger 2020-02-25 22:12:51 +08:00 • committed by Anna Henningsen
parent 26924faa54
commit f7f0441997
No known key found for this signature in database
GPG key ID: A94130F0BFC8EBE9
2 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/async_hooks.js
View file

@ -257,14 +257,11 @@ class AsyncLocalStorage {
}
runSyncAndReturn(store, callback, ...args) {
const resource = executionAsyncResource();
const outerStore = resource[this.kResourceStore];
this.enterWith(store);
try {
const resource = new AsyncResource('AsyncLocalStorage');
return resource.runInAsyncScope(() => {
this.enterWith(store);
return callback(...args);
} finally {
resource[this.kResourceStore] = outerStore;
}
});
}
exitSyncAndReturn(callback, ...args) {
@ -287,11 +284,10 @@ class AsyncLocalStorage {
}
run(store, callback, ...args) {
const resource = executionAsyncResource();
const outerStore = resource[this.kResourceStore];
this.enterWith(store);
process.nextTick(callback, ...args);
resource[this.kResourceStore] = outerStore;
process.nextTick(() => {
this.enterWith(store);
return callback(...args);
});
}
exit(callback, ...args) {