Skip to content
This repository was archived by the owner on Mar 4, 2020. It is now read-only.

fix: remove array buffer allocator patch (electron-4.x) #110

Open
wants to merge 12 commits into
base: electron-node-v10.11.0-V8-6.9
Choose a base branch
from
Open

fix: remove array buffer allocator patch (electron-4.x) #110

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
982406e
Revert "fix: allocate memory of Buffer with V8's allocator"
deepak1556 Jul 10, 2019
c2ac649
crypto: fix malloc mixing in X509ToObject
davidben Jan 25, 2019
4f63360
crypto: don't crash X509ToObject on error
davidben Jan 29, 2019
dea1404
src: allocate Buffer memory using ArrayBuffer allocator
addaleax Feb 18, 2019
5538126
src: make IsolateData store ArrayBufferAllocator
addaleax Feb 18, 2019
6418b51
worker: copy transferList ArrayBuffers on unknown allocator
addaleax Feb 19, 2019
8867a26
src: add debugging array allocator
addaleax Feb 18, 2019
b2ed6c3
src: add allocation utils to env
addaleax Feb 18, 2019
7b35642
buffer: throw exception when creating from non-Node.js Context
addaleax Oct 28, 2018
e13e8fe
src: remove outdated `Neuter()` call in `node_buffer.cc`
addaleax Jan 13, 2019
9027c0f
tls: fix malloc mismatch in SSL_set_tlsext_status_ocsp_resp call
davidben Jan 25, 2019
1ca642c
http2: fix tracking received data for maxSessionMemory
addaleax May 26, 2019
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
crypto: don't crash X509ToObject on error 
Use MaybeLocal::ToLocal and don't crash X509ToObject on error.

PR-URL: nodejs/node#25717
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
  • Loading branch information
@davidben @deepak1556
davidben authored and deepak1556 committed Jul 10, 2019
commit 4f63360eda60cb6f27fec2a0c780ff42a23049d9
27 changes: 17 additions & 10 deletions src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1556,24 +1556,27 @@ static void AddFingerprintDigest(const unsigned char* md,
}
}


static MaybeLocal<Object> ECPointToBuffer(Environment* env,
const EC_GROUP* group,
const EC_POINT* point,
point_conversion_form_t form) {
point_conversion_form_t form,
const char** error) {
size_t len = EC_POINT_point2oct(group, point, form, nullptr, 0, nullptr);
if (len == 0) {
env->ThrowError("Failed to get public key length");
if (error != nullptr) *error = "Failed to get public key length";
return MaybeLocal<Object>();
}
MallocedBuffer<unsigned char> buf(len);
len = EC_POINT_point2oct(group, point, form, buf.data, buf.size, nullptr);
if (len == 0) {
env->ThrowError("Failed to get public key");
if (error != nullptr) *error = "Failed to get public key";
return MaybeLocal<Object>();
}
return Buffer::New(env, buf.release(), len);
}


static Local<Object> X509ToObject(Environment* env, X509* cert) {
EscapableHandleScope scope(env->isolate());
Local<Context> context = env->context();
Expand Down Expand Up @@ -4474,6 +4477,7 @@ void ECDH::GetPublicKey(const FunctionCallbackInfo<Value>& args) {
ECDH* ecdh;
ASSIGN_OR_RETURN_UNWRAP(&ecdh, args.Holder());

const EC_GROUP* group = EC_KEY_get0_group(ecdh->key_.get());
const EC_POINT* pub = EC_KEY_get0_public_key(ecdh->key_.get());
if (pub == nullptr)
return env->ThrowError("Failed to get ECDH public key");
Expand All @@ -4482,10 +4486,11 @@ void ECDH::GetPublicKey(const FunctionCallbackInfo<Value>& args) {
uint32_t val = args[0].As<Uint32>()->Value();
point_conversion_form_t form = static_cast<point_conversion_form_t>(val);

MaybeLocal<Object> buf =
ECPointToBuffer(env, EC_KEY_get0_group(ecdh->key_.get()), pub, form);
if (buf.IsEmpty()) return;
args.GetReturnValue().Set(buf.ToLocalChecked());
const char* error;
Local<Object> buf;
if (!ECPointToBuffer(env, group, pub, form, &error).ToLocal(&buf))
return env->ThrowError(error);
args.GetReturnValue().Set(buf);
}


Expand Down Expand Up @@ -5088,9 +5093,11 @@ void ConvertKey(const FunctionCallbackInfo<Value>& args) {
uint32_t val = args[2].As<Uint32>()->Value();
point_conversion_form_t form = static_cast<point_conversion_form_t>(val);

MaybeLocal<Object> buf = ECPointToBuffer(env, group.get(), pub.get(), form);
if (buf.IsEmpty()) return;
args.GetReturnValue().Set(buf.ToLocalChecked());
const char* error;
Local<Object> buf;
if (!ECPointToBuffer(env, group.get(), pub.get(), form, &error).ToLocal(&buf))
return env->ThrowError(error);
args.GetReturnValue().Set(buf);
}


Expand Down