aboutsummaryrefslogtreecommitdiff
path: root/src/inspector_agent.cc
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2016-10-19 13:15:22 +0200
committerBen Noordhuis <info@bnoordhuis.nl>2016-10-24 23:06:43 +0200
commit3d9b379cd03b966a22a9bcbbbc49caa8e7acc248 (patch)
tree6b3f5a21dfbdbe2dcd574d2d68be09ce652a7c51 /src/inspector_agent.cc
parent678c094357c8656a26bb3f7348fac02e3ecc2a88 (diff)
downloadandroid-node-v8-3d9b379cd03b966a22a9bcbbbc49caa8e7acc248.tar.gz
android-node-v8-3d9b379cd03b966a22a9bcbbbc49caa8e7acc248.tar.bz2
android-node-v8-3d9b379cd03b966a22a9bcbbbc49caa8e7acc248.zip
inspector: fix request path nullptr dereference
Fix a nullptr dereference when an invalid path is requested. Regression introduced in commit 69fc85d ("inspector: generate UUID for debug targets"), caught by Coverity. PR-URL: https://github.com/nodejs/node/pull/9184 Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Eugene Ostroukhov <eostroukhov@google.com> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'src/inspector_agent.cc')
-rw-r--r--src/inspector_agent.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
index 1cbaa92b9a..3f3d548de4 100644
--- a/src/inspector_agent.cc
+++ b/src/inspector_agent.cc
@@ -681,17 +681,20 @@ bool AgentImpl::RespondToGet(InspectorSocket* socket, const std::string& path) {
if (match_path_segment(command, "list") || command[0] == '\0') {
SendTargentsListResponse(socket);
+ return true;
} else if (match_path_segment(command, "protocol")) {
SendProtocolJson(socket);
+ return true;
} else if (match_path_segment(command, "version")) {
SendVersionResponse(socket);
- } else {
- const char* pid = match_path_segment(command, "activate");
+ return true;
+ } else if (const char* pid = match_path_segment(command, "activate")) {
if (pid != id_)
return false;
SendHttpResponse(socket, "Target activated");
+ return true;
}
- return true;
+ return false;
}
// static