diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-09 17:50:54 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-09 17:50:54 -0800 |
| commit | cc05ad238516f1303687aba4a978e24e57c0c07a (patch) | |
| tree | 1a76a42da1aa8e051171854df33a46e8025aeed9 /vm/Debugger.c | |
| parent | 89c1feb0a69a7707b271086e749975b3f7acacf7 (diff) | |
| download | android_dalvik-cc05ad238516f1303687aba4a978e24e57c0c07a.tar.gz android_dalvik-cc05ad238516f1303687aba4a978e24e57c0c07a.tar.bz2 android_dalvik-cc05ad238516f1303687aba4a978e24e57c0c07a.zip | |
auto import from //branches/cupcake/...@125939
Diffstat (limited to 'vm/Debugger.c')
| -rw-r--r-- | vm/Debugger.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/vm/Debugger.c b/vm/Debugger.c index 02bb8a66b..f8e3b7516 100644 --- a/vm/Debugger.c +++ b/vm/Debugger.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /* * Link between JDWP and the VM. The code here only runs as a result of * requests from the debugger, so speed is not essential. Maintaining @@ -2266,6 +2267,12 @@ static Object* getThisObject(const u4* framePtr) else thisObj = (Object*) framePtr[argOffset]; + if (thisObj != NULL && !dvmIsValidObject(thisObj)) { + LOGW("Debugger: invalid 'this' pointer %p in %s.%s; returning NULL\n", + framePtr, method->clazz->descriptor, method->name); + thisObj = NULL; + } + return thisObj; } |