summaryrefslogtreecommitdiff
path: root/src/udp_wrap.cc
diff options
context:
space:
mode:
authorAnna Henningsen <anna@addaleax.net>2016-09-10 18:19:24 +0200
committerAnna Henningsen <anna@addaleax.net>2016-09-29 09:46:42 +0200
commitea94086ad2b53268b5cb870f9ba5a1f84741fa41 (patch)
tree71a385cacb45a15d7d573105911b93ff0f5f2e11 /src/udp_wrap.cc
parent48ed65440ca33fe6063d92379b3a9b10b65e98e9 (diff)
downloadandroid-node-v8-ea94086ad2b53268b5cb870f9ba5a1f84741fa41.tar.gz
android-node-v8-ea94086ad2b53268b5cb870f9ba5a1f84741fa41.tar.bz2
android-node-v8-ea94086ad2b53268b5cb870f9ba5a1f84741fa41.zip
src: provide allocation + nullptr check shortcuts
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 <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Ilkka Myller <ilkka.myller@nodefield.com>
Diffstat (limited to 'src/udp_wrap.cc')
-rw-r--r--src/udp_wrap.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/udp_wrap.cc b/src/udp_wrap.cc
index bbd30a5266..30113b7a8e 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);