Skip to content
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
src: remove PBKDF2Request::release()
  • Loading branch information
bnoordhuis committed Jul 17, 2017
commit 0ce90a94110d6d208ee2851ed36645ffdfb73012
27 changes: 12 additions & 15 deletions src/node_crypto.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5245,7 +5245,18 @@ class PBKDF2Request : public AsyncWrap {
}

~PBKDF2Request() override {
release();
free(pass_);
pass_ = nullptr;
passlen_ = 0;

free(salt_);
salt_ = nullptr;
saltlen_ = 0;

free(key_);
key_ = nullptr;
keylen_ = 0;

ClearWrap(object());
persistent().Reset();
}
Expand Down Expand Up @@ -5286,20 +5297,6 @@ class PBKDF2Request : public AsyncWrap {
return iter_;
}

inline void release() {
free(pass_);
pass_ = nullptr;
passlen_ = 0;

free(salt_);
salt_ = nullptr;
saltlen_ = 0;

free(key_);
key_ = nullptr;
keylen_ = 0;
}

inline int error() const {
return error_;
}
Expand Down