diff options
author | cjihrig <cjihrig@gmail.com> | 2016-10-18 22:04:41 +0300 |
---|---|---|
committer | cjihrig <cjihrig@gmail.com> | 2016-12-25 20:48:55 +0300 |
commit | 45c9ca7fd430022a9c0567e1b9f535b3e3f956fd (patch) | |
tree | 4a9d83f219edc6117286bc143daf36859188568a /src/spawn_sync.cc | |
parent | fc7b0dda85c006e5830a0e34645d769e20b894d2 (diff) |
src: remove redundant spawn/spawnSync type checks
This commit removes C++ checks from spawn() and spawnSync()
that are duplicates of the JavaScript type checking.
Fixes: https://github.com/nodejs/node/issues/8096
Fixes: https://github.com/nodejs/node/issues/8539
Refs: https://github.com/nodejs/node/issues/9722
PR-URL: https://github.com/nodejs/node/pull/8312
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'src/spawn_sync.cc')
-rw-r--r-- | src/spawn_sync.cc | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/spawn_sync.cc b/src/spawn_sync.cc index 689f605e144..68e78147578 100644 --- a/src/spawn_sync.cc +++ b/src/spawn_sync.cc @@ -734,8 +734,7 @@ int SyncProcessRunner::ParseOptions(Local<Value> js_value) { } Local<Value> js_uid = js_options->Get(env()->uid_string()); if (IsSet(js_uid)) { - if (!js_uid->IsInt32()) - return UV_EINVAL; + CHECK(js_uid->IsInt32()); const int32_t uid = js_uid->Int32Value(env()->context()).FromJust(); uv_process_options_.uid = static_cast<uv_uid_t>(uid); uv_process_options_.flags |= UV_PROCESS_SETUID; @@ -743,8 +742,7 @@ int SyncProcessRunner::ParseOptions(Local<Value> js_value) { Local<Value> js_gid = js_options->Get(env()->gid_string()); if (IsSet(js_gid)) { - if (!js_gid->IsInt32()) - return UV_EINVAL; + CHECK(js_gid->IsInt32()); const int32_t gid = js_gid->Int32Value(env()->context()).FromJust(); uv_process_options_.gid = static_cast<uv_gid_t>(gid); uv_process_options_.flags |= UV_PROCESS_SETGID; @@ -760,28 +758,21 @@ int SyncProcessRunner::ParseOptions(Local<Value> js_value) { Local<Value> js_timeout = js_options->Get(env()->timeout_string()); if (IsSet(js_timeout)) { - if (!js_timeout->IsNumber()) - return UV_EINVAL; + CHECK(js_timeout->IsNumber()); int64_t timeout = js_timeout->IntegerValue(); - if (timeout < 0) - return UV_EINVAL; timeout_ = static_cast<uint64_t>(timeout); } Local<Value> js_max_buffer = js_options->Get(env()->max_buffer_string()); if (IsSet(js_max_buffer)) { - if (!js_max_buffer->IsUint32()) - return UV_EINVAL; + CHECK(js_max_buffer->IsUint32()); max_buffer_ = js_max_buffer->Uint32Value(); } Local<Value> js_kill_signal = js_options->Get(env()->kill_signal_string()); if (IsSet(js_kill_signal)) { - if (!js_kill_signal->IsInt32()) - return UV_EINVAL; + CHECK(js_kill_signal->IsInt32()); kill_signal_ = js_kill_signal->Int32Value(); - if (kill_signal_ == 0) - return UV_EINVAL; } Local<Value> js_stdio = js_options->Get(env()->stdio_string()); |