Skip to content

Commit 4b9dcfe

Browse files
committed
Merge pull request #112 from ForbesLindesay/patch-1
Handle errors in callbacks given to `randomBytes`
2 parents c08a8ea + 1c23955 commit 4b9dcfe

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

index.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,26 @@ exports.createHmac = exports.Hmac = require('create-hmac')
1717

1818
exports.randomBytes = function(size, callback) {
1919
if (callback && callback.call) {
20+
var res;
2021
try {
21-
callback.call(this, undefined, rng(size))
22-
} catch (err) { callback(err) }
22+
res = rng(size)
23+
} catch (err) {
24+
return callback(err)
25+
}
26+
callback.call(this, undefined, res)
2327
} else {
2428
return rng(size)
2529
}
2630
}
2731
exports.pseudoRandomBytes = function(size, callback) {
2832
if (callback && callback.call) {
33+
var res;
2934
try {
30-
callback.call(this, undefined, prng(size))
31-
} catch (err) { callback(err) }
35+
res = prng(size)
36+
} catch (err) {
37+
return callback(err)
38+
}
39+
callback.call(this, undefined, res)
3240
} else {
3341
return prng(size)
3442
}

0 commit comments

Comments
 (0)