From aed9792ff41099a83cbbff174694816e35adb0fd Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sat, 10 Sep 2016 18:19:24 +0200 Subject: [PATCH] src: provide allocation + nullptr check shortcuts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Provide shortcut `node::CheckedMalloc()` and friends that replace `node::Malloc()` + `CHECK_NE(ยท, nullptr);` combinations in a few places. PR-URL: https://github.com/nodejs/node/pull/8482 Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell Reviewed-By: Michael Dawson Reviewed-By: Ilkka Myller --- src/cares_wrap.cc | 2 +- src/node.cc | 4 ++-- src/node_buffer.cc | 9 ++++----- src/node_crypto.cc | 17 ----------------- src/node_internals.h | 2 +- src/stream_wrap.cc | 8 +------- src/string_bytes.cc | 8 ++++---- src/tls_wrap.cc | 1 - src/udp_wrap.cc | 7 +------ src/util-inl.h | 29 +++++++++++++++++++++++++---- src/util.cc | 1 + src/util.h | 12 +++++++++++- test/cctest/util.cc | 16 ++++++++++++++++ 13 files changed, 67 insertions(+), 49 deletions(-) diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc index faa5f74e21e8a2..492e151832ea32 100644 --- a/src/cares_wrap.cc +++ b/src/cares_wrap.cc @@ -174,7 +174,7 @@ static void ares_poll_close_cb(uv_handle_t* watcher) { /* Allocates and returns a new node_ares_task */ static node_ares_task* ares_task_create(Environment* env, ares_socket_t sock) { - auto task = node::Malloc(1); + auto task = node::UncheckedMalloc(1); if (task == nullptr) { /* Out of memory. */ diff --git a/src/node.cc b/src/node.cc index 468fe9a165c167..12c28a5d0a2755 100644 --- a/src/node.cc +++ b/src/node.cc @@ -979,9 +979,9 @@ Local WinapiErrnoException(Isolate* isolate, void* ArrayBufferAllocator::Allocate(size_t size) { if (zero_fill_field_ || zero_fill_all_buffers) - return node::Calloc(size); + return node::UncheckedCalloc(size); else - return node::Malloc(size); + return node::UncheckedMalloc(size); } static bool DomainHasErrorHandler(const Environment* env, diff --git a/src/node_buffer.cc b/src/node_buffer.cc index 1ab664d364526d..467a6e88474b39 100644 --- a/src/node_buffer.cc +++ b/src/node_buffer.cc @@ -89,8 +89,8 @@ bool zero_fill_all_buffers = false; namespace { inline void* BufferMalloc(size_t length) { - return zero_fill_all_buffers ? node::Calloc(length) : - node::Malloc(length); + return zero_fill_all_buffers ? node::UncheckedCalloc(length) : + node::UncheckedMalloc(length); } } // namespace @@ -285,7 +285,6 @@ MaybeLocal New(Isolate* isolate, data = nullptr; } else if (actual < length) { data = node::Realloc(data, actual); - CHECK_NE(data, nullptr); } } @@ -363,7 +362,7 @@ MaybeLocal Copy(Environment* env, const char* data, size_t length) { void* new_data; if (length > 0) { CHECK_NE(data, nullptr); - new_data = node::Malloc(length); + new_data = node::UncheckedMalloc(length); if (new_data == nullptr) return Local(); memcpy(new_data, data, length); @@ -1086,7 +1085,7 @@ void IndexOfString(const FunctionCallbackInfo& args) { offset, is_forward); } else if (enc == LATIN1) { - uint8_t* needle_data = node::Malloc(needle_length); + uint8_t* needle_data = node::UncheckedMalloc(needle_length); if (needle_data == nullptr) { return args.GetReturnValue().Set(-1); } diff --git a/src/node_crypto.cc b/src/node_crypto.cc index cbcbcc70cfd34c..7ad6eceeecc0f7 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -2280,7 +2280,6 @@ int SSLWrap::TLSExtStatusCallback(SSL* s, void* arg) { // OpenSSL takes control of the pointer after accepting it char* data = node::Malloc(len); - CHECK_NE(data, nullptr); memcpy(data, resp, len); if (!SSL_set_tlsext_status_ocsp_resp(s, data, len)) @@ -3331,7 +3330,6 @@ bool CipherBase::GetAuthTag(char** out, unsigned int* out_len) const { return false; *out_len = auth_tag_len_; *out = node::Malloc(auth_tag_len_); - CHECK_NE(*out, nullptr); memcpy(*out, auth_tag_, auth_tag_len_); return true; } @@ -4907,7 +4905,6 @@ void ECDH::ComputeSecret(const FunctionCallbackInfo& args) { int field_size = EC_GROUP_get_degree(ecdh->group_); size_t out_len = (field_size + 7) / 8; char* out = node::Malloc(out_len); - CHECK_NE(out, nullptr); int r = ECDH_compute_key(out, out_len, pub, ecdh->key_, nullptr); EC_POINT_free(pub); @@ -4943,7 +4940,6 @@ void ECDH::GetPublicKey(const FunctionCallbackInfo& args) { return env->ThrowError("Failed to get public key length"); unsigned char* out = node::Malloc(size); - CHECK_NE(out, nullptr); int r = EC_POINT_point2oct(ecdh->group_, pub, form, out, size, nullptr); if (r != size) { @@ -4969,7 +4965,6 @@ void ECDH::GetPrivateKey(const FunctionCallbackInfo& args) { int size = BN_num_bytes(b); unsigned char* out = node::Malloc(size); - CHECK_NE(out, nullptr); if (size != BN_bn2bin(b, out)) { free(out); @@ -5101,8 +5096,6 @@ class PBKDF2Request : public AsyncWrap { keylen_(keylen), key_(node::Malloc(keylen)), iter_(iter) { - if (key() == nullptr) - FatalError("node::PBKDF2Request()", "Out of Memory"); Wrap(object, this); } @@ -5263,9 +5256,6 @@ void PBKDF2(const FunctionCallbackInfo& args) { THROW_AND_RETURN_IF_NOT_BUFFER(args[1], "Salt"); pass = node::Malloc(passlen); - if (pass == nullptr) { - FatalError("node::PBKDF2()", "Out of Memory"); - } memcpy(pass, Buffer::Data(args[0]), passlen); saltlen = Buffer::Length(args[1]); @@ -5275,9 +5265,6 @@ void PBKDF2(const FunctionCallbackInfo& args) { } salt = node::Malloc(saltlen); - if (salt == nullptr) { - FatalError("node::PBKDF2()", "Out of Memory"); - } memcpy(salt, Buffer::Data(args[1]), saltlen); if (!args[2]->IsNumber()) { @@ -5368,8 +5355,6 @@ class RandomBytesRequest : public AsyncWrap { error_(0), size_(size), data_(node::Malloc(size)) { - if (data() == nullptr) - FatalError("node::RandomBytesRequest()", "Out of Memory"); Wrap(object, this); } @@ -5596,8 +5581,6 @@ void GetCurves(const FunctionCallbackInfo& args) { if (num_curves) { curves = node::Malloc(num_curves); - CHECK_NE(curves, nullptr); - if (EC_get_builtin_curves(curves, num_curves)) { for (size_t i = 0; i < num_curves; i++) { arr->Set(i, OneByteString(env->isolate(), OBJ_nid2sn(curves[i].nid))); diff --git a/src/node_internals.h b/src/node_internals.h index 8af4adb053a4f7..a54ead49eeda2a 100644 --- a/src/node_internals.h +++ b/src/node_internals.h @@ -160,7 +160,7 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator { virtual void* Allocate(size_t size); // Defined in src/node.cc virtual void* AllocateUninitialized(size_t size) - { return node::Malloc(size); } + { return node::UncheckedMalloc(size); } virtual void Free(void* data, size_t) { free(data); } private: diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc index c3233e4064b309..ac656505503b22 100644 --- a/src/stream_wrap.cc +++ b/src/stream_wrap.cc @@ -150,12 +150,6 @@ void StreamWrap::OnAlloc(uv_handle_t* handle, void StreamWrap::OnAllocImpl(size_t size, uv_buf_t* buf, void* ctx) { buf->base = node::Malloc(size); buf->len = size; - - if (buf->base == nullptr && size > 0) { - FatalError( - "node::StreamWrap::DoAlloc(size_t, uv_buf_t*, void*)", - "Out Of Memory"); - } } @@ -204,8 +198,8 @@ void StreamWrap::OnReadImpl(ssize_t nread, return; } - char* base = node::Realloc(buf->base, nread); CHECK_LE(static_cast(nread), buf->len); + char* base = node::Realloc(buf->base, nread); if (pending == UV_TCP) { pending_obj = AcceptHandle(env, wrap); diff --git a/src/string_bytes.cc b/src/string_bytes.cc index 8acba5d55d1ee1..d9e8b97114e2cd 100644 --- a/src/string_bytes.cc +++ b/src/string_bytes.cc @@ -53,7 +53,7 @@ class ExternString: public ResourceType { if (length == 0) return scope.Escape(String::Empty(isolate)); - TypeName* new_data = node::Malloc(length); + TypeName* new_data = node::UncheckedMalloc(length); if (new_data == nullptr) { return Local(); } @@ -623,7 +623,7 @@ Local StringBytes::Encode(Isolate* isolate, case ASCII: if (contains_non_ascii(buf, buflen)) { - char* out = node::Malloc(buflen); + char* out = node::UncheckedMalloc(buflen); if (out == nullptr) { return Local(); } @@ -658,7 +658,7 @@ Local StringBytes::Encode(Isolate* isolate, case BASE64: { size_t dlen = base64_encoded_size(buflen); - char* dst = node::Malloc(dlen); + char* dst = node::UncheckedMalloc(dlen); if (dst == nullptr) { return Local(); } @@ -677,7 +677,7 @@ Local StringBytes::Encode(Isolate* isolate, case HEX: { size_t dlen = buflen * 2; - char* dst = node::Malloc(dlen); + char* dst = node::UncheckedMalloc(dlen); if (dst == nullptr) { return Local(); } diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc index dbe6677516afb0..d56128fec6c5ce 100644 --- a/src/tls_wrap.cc +++ b/src/tls_wrap.cc @@ -662,7 +662,6 @@ void TLSWrap::OnReadImpl(ssize_t nread, void TLSWrap::OnAllocSelf(size_t suggested_size, uv_buf_t* buf, void* ctx) { buf->base = node::Malloc(suggested_size); - CHECK_NE(buf->base, nullptr); buf->len = suggested_size; } diff --git a/src/udp_wrap.cc b/src/udp_wrap.cc index bbd30a5266e443..30113b7a8e3201 100644 --- a/src/udp_wrap.cc +++ b/src/udp_wrap.cc @@ -376,11 +376,6 @@ void UDPWrap::OnAlloc(uv_handle_t* handle, uv_buf_t* buf) { buf->base = node::Malloc(suggested_size); buf->len = suggested_size; - - if (buf->base == nullptr && suggested_size > 0) { - FatalError("node::UDPWrap::OnAlloc(uv_handle_t*, size_t, uv_buf_t*)", - "Out Of Memory"); - } } @@ -416,7 +411,7 @@ void UDPWrap::OnRecv(uv_udp_t* handle, return; } - char* base = node::Realloc(buf->base, nread); + char* base = node::UncheckedRealloc(buf->base, nread); argv[2] = Buffer::New(env, base, nread).ToLocalChecked(); argv[3] = AddressToJS(env, addr); wrap->MakeCallback(env->onmessage_string(), arraysize(argv), argv); diff --git a/src/util-inl.h b/src/util-inl.h index 3a5c7622c73cdf..a3d446c2a51655 100644 --- a/src/util-inl.h +++ b/src/util-inl.h @@ -245,7 +245,7 @@ inline size_t MultiplyWithOverflowCheck(size_t a, size_t b) { // nullptr for zero-sized allocation requests. Normalize by always using // a nullptr. template -T* Realloc(T* pointer, size_t n) { +T* UncheckedRealloc(T* pointer, size_t n) { size_t full_size = MultiplyWithOverflowCheck(sizeof(T), n); if (full_size == 0) { @@ -258,18 +258,39 @@ T* Realloc(T* pointer, size_t n) { // As per spec realloc behaves like malloc if passed nullptr. template -T* Malloc(size_t n) { +T* UncheckedMalloc(size_t n) { if (n == 0) n = 1; - return Realloc(nullptr, n); + return UncheckedRealloc(nullptr, n); } template -T* Calloc(size_t n) { +T* UncheckedCalloc(size_t n) { if (n == 0) n = 1; MultiplyWithOverflowCheck(sizeof(T), n); return static_cast(calloc(n, sizeof(T))); } +template +T* Realloc(T* pointer, size_t n) { + T* ret = UncheckedRealloc(pointer, n); + if (n > 0) CHECK_NE(ret, nullptr); + return ret; +} + +template +T* Malloc(size_t n) { + T* ret = UncheckedMalloc(n); + if (n > 0) CHECK_NE(ret, nullptr); + return ret; +} + +template +T* Calloc(size_t n) { + T* ret = UncheckedCalloc(n); + if (n > 0) CHECK_NE(ret, nullptr); + return ret; +} + } // namespace node #endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS diff --git a/src/util.cc b/src/util.cc index 7ce99d5c76aa93..14aa68996f56cc 100644 --- a/src/util.cc +++ b/src/util.cc @@ -1,6 +1,7 @@ #include "util.h" #include "string_bytes.h" #include "node_buffer.h" +#include "node_internals.h" #include namespace node { diff --git a/src/util.h b/src/util.h index 2ea80c36ae57e4..5df9b04b394586 100644 --- a/src/util.h +++ b/src/util.h @@ -32,6 +32,15 @@ namespace node { // nullptr for zero-sized allocation requests. Normalize by always using // a nullptr. template +inline T* UncheckedRealloc(T* pointer, size_t n); +template +inline T* UncheckedMalloc(size_t n); +template +inline T* UncheckedCalloc(size_t n); + +// Same things, but aborts immediately instead of returning nullptr when +// no memory is available. +template inline T* Realloc(T* pointer, size_t n); template inline T* Malloc(size_t n); @@ -41,6 +50,8 @@ inline T* Calloc(size_t n); // Shortcuts for char*. inline char* Malloc(size_t n) { return Malloc(n); } inline char* Calloc(size_t n) { return Calloc(n); } +inline char* UncheckedMalloc(size_t n) { return UncheckedMalloc(n); } +inline char* UncheckedCalloc(size_t n) { return UncheckedCalloc(n); } #ifdef __GNUC__ #define NO_RETURN __attribute__((noreturn)) @@ -306,7 +317,6 @@ class MaybeStackBuffer { buf_ = buf_st_; } else { buf_ = Malloc(storage); - CHECK_NE(buf_, nullptr); } // Remember how much was allocated to check against that in SetLength(). diff --git a/test/cctest/util.cc b/test/cctest/util.cc index 7bbf53af13d3c4..f1446ae0345153 100644 --- a/test/cctest/util.cc +++ b/test/cctest/util.cc @@ -105,3 +105,19 @@ TEST(UtilTest, Calloc) { EXPECT_NE(nullptr, Calloc(0)); EXPECT_NE(nullptr, Calloc(1)); } + +TEST(UtilTest, UncheckedMalloc) { + using node::UncheckedMalloc; + EXPECT_NE(nullptr, UncheckedMalloc(0)); + EXPECT_NE(nullptr, UncheckedMalloc(1)); + EXPECT_NE(nullptr, UncheckedMalloc(0)); + EXPECT_NE(nullptr, UncheckedMalloc(1)); +} + +TEST(UtilTest, UncheckedCalloc) { + using node::UncheckedCalloc; + EXPECT_NE(nullptr, UncheckedCalloc(0)); + EXPECT_NE(nullptr, UncheckedCalloc(1)); + EXPECT_NE(nullptr, UncheckedCalloc(0)); + EXPECT_NE(nullptr, UncheckedCalloc(1)); +}