commit 0fb33e7b7b0b86fb9c7b556e4a052874ec269bb0
author Sebastien Hertz <shertz@google.com> Fri Dec 05 10:52:15 2014 +0100
committer Sebastien Hertz <shertz@google.com> Fri Dec 05 10:52:15 2014 +0100
tree 99b74a1ea7edf9444c893fc2551e0aae65794b94
parent 25fda92083d5b93b38cc1f6b12ac6a44d992d6a4

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
Change-Id: I97729e2f98af3a75d24604926a89860255d4acae

runtime/jdwp/jdwp_handler.cc

diff --git a/runtime/jdwp/jdwp_handler.cc b/runtime/jdwp/jdwp_handler.cc
index e6d7e7b..2d0301f 100644
--- a/runtime/jdwp/jdwp_handler.cc
+++ b/runtime/jdwp/jdwp_handler.cc
@@ -1344,8 +1344,10 @@
       }
       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;
     }
   }