grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix mismatched new[] and delete in Node extension code

This commit is contained in:
murgatroid99 2016-09-20 09:55:33 -07:00
parent dc9eded992
commit bc2693ee52
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/server_credentials.cc
View File

@ -169,18 +169,18 @@ NAN_METHOD(ServerCredentials::CreateSsl) {
for(uint32_t i = 0; i < key_cert_pair_count; i++) { for(uint32_t i = 0; i < key_cert_pair_count; i++) {
Local<Value> pair_val = Nan::Get(pair_list, i).ToLocalChecked(); Local<Value> pair_val = Nan::Get(pair_list, i).ToLocalChecked();
if (!pair_val->IsObject()) { if (!pair_val->IsObject()) {
delete key_cert_pairs; delete[] key_cert_pairs;
return Nan::ThrowTypeError("Key/cert pairs must be objects"); return Nan::ThrowTypeError("Key/cert pairs must be objects");
} }
Local<Object> pair_obj = Nan::To<Object>(pair_val).ToLocalChecked(); Local<Object> pair_obj = Nan::To<Object>(pair_val).ToLocalChecked();
Local<Value> maybe_key = Nan::Get(pair_obj, key_key).ToLocalChecked(); Local<Value> maybe_key = Nan::Get(pair_obj, key_key).ToLocalChecked();
Local<Value> maybe_cert = Nan::Get(pair_obj, cert_key).ToLocalChecked(); Local<Value> maybe_cert = Nan::Get(pair_obj, cert_key).ToLocalChecked();
if (!::node::Buffer::HasInstance(maybe_key)) { if (!::node::Buffer::HasInstance(maybe_key)) {
delete key_cert_pairs; delete[] key_cert_pairs;
return Nan::ThrowTypeError("private_key must be a Buffer"); return Nan::ThrowTypeError("private_key must be a Buffer");
} }
if (!::node::Buffer::HasInstance(maybe_cert)) { if (!::node::Buffer::HasInstance(maybe_cert)) {
delete key_cert_pairs; delete[] key_cert_pairs;
return Nan::ThrowTypeError("cert_chain must be a Buffer"); return Nan::ThrowTypeError("cert_chain must be a Buffer");
} }
key_cert_pairs[i].private_key = ::node::Buffer::Data(maybe_key); key_cert_pairs[i].private_key = ::node::Buffer::Data(maybe_key);
@ -189,7 +189,7 @@ NAN_METHOD(ServerCredentials::CreateSsl) {
grpc_server_credentials *creds = grpc_ssl_server_credentials_create_ex( grpc_server_credentials *creds = grpc_ssl_server_credentials_create_ex(
root_certs, key_cert_pairs, key_cert_pair_count, root_certs, key_cert_pairs, key_cert_pair_count,
client_certificate_request, NULL); client_certificate_request, NULL);
delete key_cert_pairs; delete[] key_cert_pairs;
if (creds == NULL) { if (creds == NULL) {
info.GetReturnValue().SetNull(); info.GetReturnValue().SetNull();
} else { } else {