commit 60ed7da4d193e0f90b05c4236af77d3b276c0ea4
author Sebastien Hertz <shertz@google.com> Thu Aug 28 18:50:36 2014 +0200
committer Sebastien Hertz <shertz@google.com> Thu Aug 28 18:51:18 2014 +0200
tree c910fe44c447c67fba9c2725f2f01c7a5a34ca5a
parent 9c18858899738f79e75b5a31a96b91c8bfa8bdd7

Avoid null pointer dereference when sending JDWP packets

Bug: 16218394

Change-Id: Id0ab09401b01f3041ea36013330a000d7702d8fa

runtime/jdwp/jdwp_main.cc

diff --git a/runtime/jdwp/jdwp_main.cc b/runtime/jdwp/jdwp_main.cc
index 4155c82..a4f427c 100644
--- a/runtime/jdwp/jdwp_main.cc
+++ b/runtime/jdwp/jdwp_main.cc
@@ -143,7 +143,7 @@
 }
 
 void JdwpState::SendBufferedRequest(uint32_t type, const std::vector<iovec>& iov) {
-  if (netState->clientSock < 0) {
+  if (!IsConnected()) {
     // Can happen with some DDMS events.
     VLOG(jdwp) << "Not sending JDWP packet: no debugger attached!";
     return;
@@ -167,7 +167,7 @@
 }
 
 void JdwpState::SendRequest(ExpandBuf* pReq) {
-  if (netState->clientSock < 0) {
+  if (!IsConnected()) {
     // Can happen with some DDMS events.
     VLOG(jdwp) << "Not sending JDWP packet: no debugger attached!";
     return;