summaryrefslogtreecommitdiffstats
path: root/jdwpspy/Net.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2011-12-08 21:28:17 -0800
committerElliott Hughes <enh@google.com>2011-12-08 21:45:49 -0800
commit7b3cdfcca472b779cf8745fb8460935e56229f11 (patch)
treee74e88286c9f121ed1312faece45981ba4e0b14c /jdwpspy/Net.cpp
parent6f1dfe415019de95f0305de66b3afb40005fe382 (diff)
downloadandroid_art-7b3cdfcca472b779cf8745fb8460935e56229f11.tar.gz
android_art-7b3cdfcca472b779cf8745fb8460935e56229f11.tar.bz2
android_art-7b3cdfcca472b779cf8745fb8460935e56229f11.zip
More JDWP robustness.
We pass a lot more JDWP tests with this (fewer total failures than dalvik, because although dalvik implements more requests, it assumes that the debuggers only send it valid input). I've also added some of the missing constants (there are tests of modifier 12, SourceNameMatch, which was added in Java 6). Change-Id: I502e87b50fb305c5c8b061421339c8ceab104640
Diffstat (limited to 'jdwpspy/Net.cpp')
-rw-r--r--jdwpspy/Net.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/jdwpspy/Net.cpp b/jdwpspy/Net.cpp
index 54d77305ae..eea21c8564 100644
--- a/jdwpspy/Net.cpp
+++ b/jdwpspy/Net.cpp
@@ -230,7 +230,7 @@ void jdwpNetFree(NetState* netState); /* fwd */
NetState* jdwpNetStartup(unsigned short listenPort, const char* connectHost,
unsigned short connectPort)
{
- NetState* netState = (NetState*) malloc(sizeof(*netState));
+ NetState* netState = new NetState;
memset(netState, 0, sizeof(*netState));
netState->listenSock = -1;
netState->dbg.sock = netState->vm.sock = -1;
@@ -342,7 +342,7 @@ void jdwpNetFree(NetState* netState)
return;
jdwpNetShutdown(netState);
- free(netState);
+ delete netState;
}
/*