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

src: replace manual memory mgmt with std::string

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/15782
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Minwoo Jung <minwoo@nodesource.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Ben Noordhuis 2017-10-05 16:02:57 +02:00 committed by James M Snell
parent 84579b1d7d
commit fca31be833
2 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/tls_wrap.cc
View File

@ -66,7 +66,6 @@ TLSWrap::TLSWrap(Environment* env,
started_(false), started_(false),
established_(false), established_(false),
shutdown_(false), shutdown_(false),
error_(nullptr),
cycle_depth_(0), cycle_depth_(0),
eof_(false) { eof_(false) {
node::Wrap(object(), this); node::Wrap(object(), this);
@ -103,8 +102,6 @@ TLSWrap::~TLSWrap() {
#ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB #ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
sni_context_.Reset(); sni_context_.Reset();
#endif // SSL_CTRL_SET_TLSEXT_SERVERNAME_CB #endif // SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
ClearError();
} }
@ -367,7 +364,7 @@ void TLSWrap::EncOutCb(WriteWrap* req_wrap, int status) {
} }
Local<Value> TLSWrap::GetSSLError(int status, int* err, const char** msg) { Local<Value> TLSWrap::GetSSLError(int status, int* err, std::string* msg) {
EscapableHandleScope scope(env()->isolate()); EscapableHandleScope scope(env()->isolate());
// ssl_ is already destroyed in reading EOF by close notify alert. // ssl_ is already destroyed in reading EOF by close notify alert.
@ -398,13 +395,9 @@ Local<Value> TLSWrap::GetSSLError(int status, int* err, const char** msg) {
OneByteString(env()->isolate(), mem->data, mem->length); OneByteString(env()->isolate(), mem->data, mem->length);
Local<Value> exception = Exception::Error(message); Local<Value> exception = Exception::Error(message);
if (msg != nullptr) { if (msg != nullptr)
CHECK_EQ(*msg, nullptr); msg->assign(mem->data, mem->data + mem->length);
char* const buf = new char[mem->length + 1];
memcpy(buf, mem->data, mem->length);
buf[mem->length] = '\0';
*msg = buf;
}
BIO_free_all(bio); BIO_free_all(bio);
return scope.Escape(exception); return scope.Escape(exception);
@ -516,12 +509,11 @@ bool TLSWrap::ClearIn() {
// Error or partial write // Error or partial write
int err; int err;
const char* error_str = nullptr; std::string error_str;
Local<Value> arg = GetSSLError(written, &err, &error_str); Local<Value> arg = GetSSLError(written, &err, &error_str);
if (!arg.IsEmpty()) { if (!arg.IsEmpty()) {
MakePending(); MakePending();
InvokeQueued(UV_EPROTO, error_str); InvokeQueued(UV_EPROTO, error_str.c_str());
delete[] error_str;
clear_in_->Reset(); clear_in_->Reset();
} }
@ -570,13 +562,12 @@ int TLSWrap::ReadStop() {
const char* TLSWrap::Error() const { const char* TLSWrap::Error() const {
return error_; return error_.empty() ? nullptr : error_.c_str();
} }
void TLSWrap::ClearError() { void TLSWrap::ClearError() {
delete[] error_; error_.clear();
error_ = nullptr;
} }
@ -624,11 +615,7 @@ int TLSWrap::DoWrite(WriteWrap* w,
if (ssl_ == nullptr) { if (ssl_ == nullptr) {
ClearError(); ClearError();
error_ = "Write after DestroySSL";
static char msg[] = "Write after DestroySSL";
char* tmp = new char[sizeof(msg)];
memcpy(tmp, msg, sizeof(msg));
error_ = tmp;
return UV_EPROTO; return UV_EPROTO;
} }

7
src/tls_wrap.h
View File

@ -35,6 +35,8 @@
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <string>
namespace node { namespace node {
// Forward-declarations // Forward-declarations
@ -148,8 +150,7 @@ class TLSWrap : public AsyncWrap,
void DoRead(ssize_t nread, const uv_buf_t* buf, uv_handle_type pending); void DoRead(ssize_t nread, const uv_buf_t* buf, uv_handle_type pending);
// If |msg| is not nullptr, caller is responsible for calling `delete[] *msg`. v8::Local<v8::Value> GetSSLError(int status, int* err, std::string* msg);
v8::Local<v8::Value> GetSSLError(int status, int* err, const char** msg);
static void OnClientHelloParseEnd(void* arg); static void OnClientHelloParseEnd(void* arg);
static void Wrap(const v8::FunctionCallbackInfo<v8::Value>& args); static void Wrap(const v8::FunctionCallbackInfo<v8::Value>& args);
@ -180,7 +181,7 @@ class TLSWrap : public AsyncWrap,
bool started_; bool started_;
bool established_; bool established_;
bool shutdown_; bool shutdown_;
const char* error_; std::string error_;
int cycle_depth_; int cycle_depth_;
// If true - delivered EOF to the js-land, either after `close_notify`, or // If true - delivered EOF to the js-land, either after `close_notify`, or