Skip to content

Commit 8f4b84b

Browse files
bnoordhuisaddaleax
authored andcommitted
src: remove PBKDF2Request::release()
PR-URL: #14122 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent b5802c7 commit 8f4b84b

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

src/node_crypto.cc

+12-15
Original file line numberDiff line numberDiff line change
@@ -5245,7 +5245,18 @@ class PBKDF2Request : public AsyncWrap {
52455245
}
52465246

52475247
~PBKDF2Request() override {
5248-
release();
5248+
free(pass_);
5249+
pass_ = nullptr;
5250+
passlen_ = 0;
5251+
5252+
free(salt_);
5253+
salt_ = nullptr;
5254+
saltlen_ = 0;
5255+
5256+
free(key_);
5257+
key_ = nullptr;
5258+
keylen_ = 0;
5259+
52495260
ClearWrap(object());
52505261
persistent().Reset();
52515262
}
@@ -5286,20 +5297,6 @@ class PBKDF2Request : public AsyncWrap {
52865297
return iter_;
52875298
}
52885299

5289-
inline void release() {
5290-
free(pass_);
5291-
pass_ = nullptr;
5292-
passlen_ = 0;
5293-
5294-
free(salt_);
5295-
salt_ = nullptr;
5296-
saltlen_ = 0;
5297-
5298-
free(key_);
5299-
key_ = nullptr;
5300-
keylen_ = 0;
5301-
}
5302-
53035300
inline int error() const {
53045301
return error_;
53055302
}

0 commit comments

Comments
 (0)