From 60ed7da4d193e0f90b05c4236af77d3b276c0ea4 Mon Sep 17 00:00:00 2001 From: Sebastien Hertz Date: Thu, 28 Aug 2014 18:50:36 +0200 Subject: Avoid null pointer dereference when sending JDWP packets Bug: 16218394 Change-Id: Id0ab09401b01f3041ea36013330a000d7702d8fa --- runtime/jdwp/jdwp_main.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/jdwp/jdwp_main.cc b/runtime/jdwp/jdwp_main.cc index 4155c82699..a4f427ca29 100644 --- a/runtime/jdwp/jdwp_main.cc +++ b/runtime/jdwp/jdwp_main.cc @@ -143,7 +143,7 @@ bool JdwpState::IsConnected() { } void JdwpState::SendBufferedRequest(uint32_t type, const std::vector& 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::SendBufferedRequest(uint32_t type, const std::vector& iov } 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; -- cgit v1.2.3