diff options
| author | Sebastien Hertz <shertz@google.com> | 2014-03-17 08:23:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-17 08:23:53 +0000 |
| commit | 341a84af890a328a6c8f719beb3f670dd1a369b4 (patch) | |
| tree | 0db31e4f83046b3d8159d4ba28d9298ff94e06c3 /runtime/jdwp | |
| parent | f17ce4c5e3b6882aa8849d1ed82df4238c436da2 (diff) | |
| parent | cb19ebf7609f74b223bd86c94f721498795f9bba (diff) | |
| download | art-341a84af890a328a6c8f719beb3f670dd1a369b4.zip art-341a84af890a328a6c8f719beb3f670dd1a369b4.tar.gz art-341a84af890a328a6c8f719beb3f670dd1a369b4.tar.bz2 | |
Merge "Fix debugger crash in native method frames."
Diffstat (limited to 'runtime/jdwp')
| -rw-r--r-- | runtime/jdwp/jdwp_handler.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/runtime/jdwp/jdwp_handler.cc b/runtime/jdwp/jdwp_handler.cc index 4b170ba..5f21098 100644 --- a/runtime/jdwp/jdwp_handler.cc +++ b/runtime/jdwp/jdwp_handler.cc @@ -1409,7 +1409,10 @@ static JdwpError SF_GetValues(JdwpState*, Request& request, ExpandBuf* pReply) size_t width = Dbg::GetTagWidth(reqSigByte); uint8_t* ptr = expandBufAddSpace(pReply, width+1); - Dbg::GetLocalValue(thread_id, frame_id, slot, reqSigByte, ptr, width); + JdwpError error = Dbg::GetLocalValue(thread_id, frame_id, slot, reqSigByte, ptr, width); + if (error != ERR_NONE) { + return error; + } } return ERR_NONE; @@ -1431,7 +1434,10 @@ static JdwpError SF_SetValues(JdwpState*, Request& request, ExpandBuf*) uint64_t value = request.ReadValue(width); VLOG(jdwp) << " --> slot " << slot << " " << sigByte << " " << value; - Dbg::SetLocalValue(thread_id, frame_id, slot, sigByte, value, width); + JdwpError error = Dbg::SetLocalValue(thread_id, frame_id, slot, sigByte, value, width); + if (error != ERR_NONE) { + return error; + } } return ERR_NONE; |