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

crypto: change segmentation faults to CHECKs

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/14548
Fixes: https://github.com/nodejs/node/issues/14519
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This commit is contained in:
Tobias Nießen 2017-07-30 22:36:29 +02:00
parent 8a8a6865c0
commit 1c362436b7
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/node_crypto.cc
View File

@ -5424,8 +5424,13 @@ void PBKDF2(const FunctionCallbackInfo<Value>& args) {
if (args[5]->IsFunction()) { if (args[5]->IsFunction()) {
obj->Set(env->ondone_string(), args[5]); obj->Set(env->ondone_string(), args[5]);
if (env->in_domain()) if (env->in_domain()) {
obj->Set(env->domain_string(), env->domain_array()->Get(0)); obj->Set(env->context(),
env->domain_string(),
env->domain_array()->Get(env->context(), 0).ToLocalChecked())
.FromJust();
}
uv_queue_work(env->event_loop(), uv_queue_work(env->event_loop(),
req->work_req(), req->work_req(),
PBKDF2Request::Work, PBKDF2Request::Work,
@ -5627,8 +5632,13 @@ void RandomBytes(const FunctionCallbackInfo<Value>& args) {
if (args[1]->IsFunction()) { if (args[1]->IsFunction()) {
obj->Set(env->ondone_string(), args[1]); obj->Set(env->ondone_string(), args[1]);
if (env->in_domain()) if (env->in_domain()) {
obj->Set(env->domain_string(), env->domain_array()->Get(0)); obj->Set(env->context(),
env->domain_string(),
env->domain_array()->Get(env->context(), 0).ToLocalChecked())
.FromJust();
}
uv_queue_work(env->event_loop(), uv_queue_work(env->event_loop(),
req->work_req(), req->work_req(),
RandomBytesWork, RandomBytesWork,
@ -5673,7 +5683,8 @@ void RandomBytesBuffer(const FunctionCallbackInfo<Value>& args) {
if (env->in_domain()) { if (env->in_domain()) {
obj->Set(env->context(), obj->Set(env->context(),
env->domain_string(), env->domain_string(),
env->domain_array()->Get(0)).FromJust(); env->domain_array()->Get(env->context(), 0).ToLocalChecked())
.FromJust();
} }
uv_queue_work(env->event_loop(), uv_queue_work(env->event_loop(),