1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crypto: fix memory leak when decrypting empty strings

Browse Source 
Also fixes a dangling pointer delete[] in the error path.
This commit is contained in:
Ben Noordhuis 2011-12-13 21:22:15 +01:00
parent d70ef199f1
commit 77f21787d4
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/node_crypto.cc
View File

@ -2327,7 +2327,12 @@ class Decipher : public ObjectWrap {
} }
int DecipherUpdate(char* data, int len, unsigned char** out, int* out_len) { int DecipherUpdate(char* data, int len, unsigned char** out, int* out_len) {
if (!initialised_) return 0; if (!initialised_) {
*out_len = 0;
*out = NULL;
return 0;
}
*out_len=len+EVP_CIPHER_CTX_block_size(&ctx); *out_len=len+EVP_CIPHER_CTX_block_size(&ctx);
*out= new unsigned char[*out_len]; *out= new unsigned char[*out_len];
@ -2337,7 +2342,12 @@ class Decipher : public ObjectWrap {
// coverity[alloc_arg] // coverity[alloc_arg]
int DecipherFinal(unsigned char** out, int *out_len, bool tolerate_padding) { int DecipherFinal(unsigned char** out, int *out_len, bool tolerate_padding) {
if (!initialised_) return 0; if (!initialised_) {
*out_len = 0;
*out = NULL;
return 0;
}
*out = new unsigned char[EVP_CIPHER_CTX_block_size(&ctx)]; *out = new unsigned char[EVP_CIPHER_CTX_block_size(&ctx)];
if (tolerate_padding) { if (tolerate_padding) {
local_EVP_DecryptFinal_ex(&ctx,*out,out_len); local_EVP_DecryptFinal_ex(&ctx,*out,out_len);
@ -2597,10 +2607,10 @@ class Decipher : public ObjectWrap {
int r = cipher->DecipherFinal(&out_value, &out_len, false); int r = cipher->DecipherFinal(&out_value, &out_len, false);
if (out_len == 0 || r == 0) { if (out_len == 0 || r == 0) {
delete[] out_value;
return scope.Close(String::New("")); return scope.Close(String::New(""));
} }
if (args.Length() == 0 || !args[0]->IsString()) { if (args.Length() == 0 || !args[0]->IsString()) {
outString = Encode(out_value, out_len, BINARY); outString = Encode(out_value, out_len, BINARY);
} else { } else {