Archives/fuse-friends_fuse-native
1
0
Fork 0
mirror of https://github.com/fuse-friends/fuse-native synced 2024-10-27 18:34:01 +00:00
Code Issues Releases Wiki Activity

fix timeout assert crashes

Browse Source
This commit is contained in:
Mathias Buus 2020-06-02 16:10:19 +02:00
parent 977307b1b3
commit 7f529df642
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
index.js
View File

@ -230,7 +230,8 @@ class Fuse extends Nanoresource {
return function (nativeHandler, opCode, ...args) { return function (nativeHandler, opCode, ...args) {
const sig = signal.bind(null, nativeHandler) const sig = signal.bind(null, nativeHandler)
const boundSignal = to ? autoTimeout(sig) : sig const input = [...args]
const boundSignal = to ? autoTimeout(sig, input) : sig
const funcName = `_op_${name}` const funcName = `_op_${name}`
if (!self[funcName] || !self._implemented.has(op)) return boundSignal(-1, ...defaults) if (!self[funcName] || !self._implemented.has(op)) return boundSignal(-1, ...defaults)
return self[funcName].apply(self, [boundSignal, ...args]) return self[funcName].apply(self, [boundSignal, ...args])
@ -247,16 +248,32 @@ class Fuse extends Nanoresource {
return process.nextTick(nativeSignal, ...arr) return process.nextTick(nativeSignal, ...arr)
} }
function autoTimeout (cb) { function autoTimeout (cb, input) {
let called = false let called = false
const timeout = setTimeout(timeoutWrap, to, TIMEOUT_ERRNO) const timeout = setTimeout(timeoutWrap, to, TIMEOUT_ERRNO)
return timeoutWrap return timeoutWrap
function timeoutWrap (...args) { function timeoutWrap (err, ...args) {
if (called) return if (called) return
called = true called = true
clearTimeout(timeout) clearTimeout(timeout)
cb(...args)
if (err === TIMEOUT_ERRNO) {
switch (op) {
case 'write':
case 'read':
return cb(TIMEOUT_ERRNO, 0, input[2])
case 'setxattr':
return cb(TIMEOUT_ERRNO, input[2])
case 'getxattr':
return cb(TIMEOUT_ERRNO, input[2])
case 'listxattr':
return cb(TIMEOUT_ERRNO, input[1])
}
}
cb(err, ...args)
} }
} }
} }