diff options
| author | Sebastien Hertz <shertz@google.com> | 2014-12-05 10:52:15 +0100 |
|---|---|---|
| committer | Sebastien Hertz <shertz@google.com> | 2014-12-09 11:40:13 +0100 |
| commit | 6d7839e03348111a4237f0d47d0e70bc81b32e7a (patch) | |
| tree | b499eff6e4bb4b57367a5acfbfd2deff58694e41 /runtime/jdwp | |
| parent | c4925d4c02dc8f8d51cb2653b5e7a99f6c9fd7d7 (diff) | |
| download | art-6d7839e03348111a4237f0d47d0e70bc81b32e7a.tar.gz art-6d7839e03348111a4237f0d47d0e70bc81b32e7a.tar.bz2 art-6d7839e03348111a4237f0d47d0e70bc81b32e7a.zip | |
JDWP: avoid crash on unsupported modifier
Returns NOT_IMPLEMENTED error if we receive an event request with an
unsupported modifier.
Bug: https://code.google.com/p/android/issues/detail?id=81037
Bug: 18617787
(cherry picked from commit 0fb33e7b7b0b86fb9c7b556e4a052874ec269bb0)
Change-Id: I97729e2f98af3a75d24604926a89860255d4acae
Diffstat (limited to 'runtime/jdwp')
| -rw-r--r-- | runtime/jdwp/jdwp_handler.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/runtime/jdwp/jdwp_handler.cc b/runtime/jdwp/jdwp_handler.cc index be34bd3df2..a39a7b76fb 100644 --- a/runtime/jdwp/jdwp_handler.cc +++ b/runtime/jdwp/jdwp_handler.cc @@ -1345,8 +1345,10 @@ static JdwpError ER_Set(JdwpState* state, Request* request, ExpandBuf* pReply) } break; default: - LOG(WARNING) << "GLITCH: unsupported modKind=" << mod.modKind; - break; + LOG(WARNING) << "Unsupported modifier " << mod.modKind << " for event " << pEvent->eventKind; + // Free allocated event to avoid leak before leaving. + EventFree(pEvent); + return JDWP::ERR_NOT_IMPLEMENTED; } } |