@@ -48,8 +48,8 @@ void PrintDebuggerReadyMessage(int port) {
48
48
port, DEVTOOLS_HASH, port);
49
49
}
50
50
51
- bool AcceptsConnection (inspector_socket_t * socket, const char * path) {
52
- return strncmp (DEVTOOLS_PATH, path, sizeof (DEVTOOLS_PATH)) == 0 ;
51
+ bool AcceptsConnection (inspector_socket_t * socket, const std::string& path) {
52
+ return 0 == path. compare ( 0 , sizeof (DEVTOOLS_PATH) - 1 , DEVTOOLS_PATH) ;
53
53
}
54
54
55
55
void DisposeInspector (inspector_socket_t * socket, int status) {
@@ -63,10 +63,7 @@ void DisconnectAndDisposeIO(inspector_socket_t* socket) {
63
63
}
64
64
65
65
void OnBufferAlloc (uv_handle_t * handle, size_t len, uv_buf_t * buf) {
66
- if (len > 0 ) {
67
- buf->base = static_cast <char *>(malloc (len));
68
- CHECK_NE (buf->base , nullptr );
69
- }
66
+ buf->base = new char [len];
70
67
buf->len = len;
71
68
}
72
69
@@ -133,18 +130,19 @@ void SendTargentsListResponse(inspector_socket_t* socket, int port) {
133
130
SendHttpResponse (socket, buffer, len);
134
131
}
135
132
136
- bool RespondToGet (inspector_socket_t * socket, const char * path, int port) {
133
+ bool RespondToGet (inspector_socket_t * socket, const std::string& path,
134
+ int port) {
137
135
const char PATH[] = " /json" ;
138
136
const char PATH_LIST[] = " /json/list" ;
139
137
const char PATH_VERSION[] = " /json/version" ;
140
138
const char PATH_ACTIVATE[] = " /json/activate/" ;
141
- if (! strncmp (PATH_VERSION, path, sizeof (PATH_VERSION))) {
139
+ if (0 == path. compare ( 0 , sizeof (PATH_VERSION) - 1 , PATH_VERSION )) {
142
140
SendVersionResponse (socket);
143
- } else if (! strncmp (PATH_LIST, path, sizeof (PATH_LIST)) ||
144
- ! strncmp (PATH, path, sizeof (PATH))) {
141
+ } else if (0 == path. compare ( 0 , sizeof (PATH_LIST) - 1 , PATH_LIST ) ||
142
+ 0 == path. compare ( 0 , sizeof (PATH) - 1 , PATH)) {
145
143
SendTargentsListResponse (socket, port);
146
- } else if (! strncmp ( path, PATH_ACTIVATE, sizeof (PATH_ACTIVATE) - 1 ) &&
147
- atoi (path + (sizeof (PATH_ACTIVATE) - 1 )) == getpid ()) {
144
+ } else if (0 == path. compare ( 0 , sizeof (PATH_ACTIVATE) - 1 , PATH_ACTIVATE ) &&
145
+ atoi (path. substr (sizeof (PATH_ACTIVATE) - 1 ). c_str ( )) == getpid ()) {
148
146
const char TARGET_ACTIVATED[] = " Target activated" ;
149
147
SendHttpResponse (socket, TARGET_ACTIVATED, sizeof (TARGET_ACTIVATED) - 1 );
150
148
} else {
@@ -181,7 +179,7 @@ class AgentImpl {
181
179
static void OnSocketConnectionIO (uv_stream_t * server, int status);
182
180
static bool OnInspectorHandshakeIO (inspector_socket_t * socket,
183
181
enum inspector_handshake_event state,
184
- const char * path);
182
+ const std::string& path);
185
183
static void WriteCbIO (uv_async_t * async);
186
184
187
185
void WorkerRunIO ();
@@ -388,7 +386,6 @@ void AgentImpl::ThreadCbIO(void* agent) {
388
386
void AgentImpl::OnSocketConnectionIO (uv_stream_t * server, int status) {
389
387
if (status == 0 ) {
390
388
inspector_socket_t * socket = new inspector_socket_t ();
391
- memset (socket, 0 , sizeof (*socket));
392
389
socket->data = server->data ;
393
390
if (inspector_accept (server, socket,
394
391
AgentImpl::OnInspectorHandshakeIO) != 0 ) {
@@ -399,8 +396,8 @@ void AgentImpl::OnSocketConnectionIO(uv_stream_t* server, int status) {
399
396
400
397
// static
401
398
bool AgentImpl::OnInspectorHandshakeIO (inspector_socket_t * socket,
402
- enum inspector_handshake_event state,
403
- const char * path) {
399
+ enum inspector_handshake_event state,
400
+ const std::string& path) {
404
401
AgentImpl* agent = static_cast <AgentImpl*>(socket->data );
405
402
switch (state) {
406
403
case kInspectorHandshakeHttpGet :
@@ -443,7 +440,7 @@ void AgentImpl::OnRemoteDataIO(inspector_socket_t* socket,
443
440
DisconnectAndDisposeIO (socket);
444
441
}
445
442
if (buf) {
446
- free ( buf->base ) ;
443
+ delete[] buf->base ;
447
444
}
448
445
pause_cond_.Broadcast (scoped_lock);
449
446
}
0 commit comments