summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBufoViridis <30531954+BufoViridis@users.noreply.github.com>2018-01-30 19:43:50 +0200
committerRuben Bridgewater <ruben@bridgewater.de>2018-02-06 13:49:09 +0100
commit6a29630c30186d7a0c71203fe7b15a39ea080c1d (patch)
treef9797dabf108570f9f956b0238e35d1904671fc2 /src
parent075eef59561c259b7d9df9f72672419feaf4a40e (diff)
downloadandroid-node-v8-6a29630c30186d7a0c71203fe7b15a39ea080c1d.tar.gz
android-node-v8-6a29630c30186d7a0c71203fe7b15a39ea080c1d.tar.bz2
android-node-v8-6a29630c30186d7a0c71203fe7b15a39ea080c1d.zip
src: fix crypto.pbkdf2 callback error argument
Callbacks should always return `null` instead of `undefined` if no error occurred. PR-URL: https://github.com/nodejs/node/pull/18458 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/node_crypto.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 1f185dd715..ee0fbab5d8 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -4943,7 +4943,7 @@ void PBKDF2Request::Work(uv_work_t* work_req) {
void PBKDF2Request::After(Local<Value> (*argv)[2]) {
if (success_) {
- (*argv)[0] = Undefined(env()->isolate());
+ (*argv)[0] = Null(env()->isolate());
(*argv)[1] = Buffer::New(env(), key_, keylen_).ToLocalChecked();
key_ = nullptr;
keylen_ = 0;