summaryrefslogtreecommitdiffstats
path: root/runtime/runtime.cc
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2013-08-15 10:26:54 -0700
committerIan Rogers <irogers@google.com>2013-08-15 11:43:12 -0700
commitbc939663ccfbe0c648dd6a3670041510aca82420 (patch)
tree40dd741cec1cefe435e666722cdf974131321d88 /runtime/runtime.cc
parentfbb0ba491042a7f8fb38f51b2f0538ca8fd074a6 (diff)
downloadart-bc939663ccfbe0c648dd6a3670041510aca82420.zip
art-bc939663ccfbe0c648dd6a3670041510aca82420.tar.gz
art-bc939663ccfbe0c648dd6a3670041510aca82420.tar.bz2
Prevent segvs in JNI.
A segv in JNI code (without CheckJNI) is hard to debug as we fail to see stacks, pending exceptions.. Make JNI code robust to null arguments, but don't go to the lengths that CheckJNI does in also sanity checking arguments, the priority here is just to stop the VM from crashing. Bug 10305723 Also, allow an unknown throw location not to crash exception dumping. Found/useful for debugging bug 10331039. Change-Id: Ib1e5540df87e2d9ce7570802d624baae7797611f
Diffstat (limited to 'runtime/runtime.cc')
-rw-r--r--runtime/runtime.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index aaae300..c4a9503 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -166,7 +166,7 @@ struct AbortState {
ThrowLocation throw_location;
mirror::Throwable* exception = self->GetException(&throw_location);
os << "Pending exception " << PrettyTypeOf(exception)
- << " thrown by '" << throw_location.Dump() << "\n"
+ << " thrown by '" << throw_location.Dump() << "'\n"
<< exception->Dump();
}
}