From 54a5ecb6b046485a8b1f476cf957f6320a42c59c Mon Sep 17 00:00:00 2001
From: gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 9 Aug 2006 14:59:16 +0000
Subject: [PATCH] 2006-08-09 Gary Benson <gbenson@redhat.com>
* stacktrace.cc (accesscontrol_trace_fn): Skip non-Java frames.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116038 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 4 ++++
libjava/stacktrace.cc | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9be7e4ac6cc3..f8c4f5d6f6ee 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-09 Gary Benson <gbenson@redhat.com>
+
+ * stacktrace.cc (accesscontrol_trace_fn): Skip non-Java frames.
+
2006-08-09 Gary Benson <gbenson@redhat.com>
* java/lang/System.java (setSecurityManager): Javadoc fix.
diff --git a/libjava/stacktrace.cc b/libjava/stacktrace.cc
index e81294ddf690..bd011d005ceb 100644
--- a/libjava/stacktrace.cc
+++ b/libjava/stacktrace.cc
@@ -542,12 +542,14 @@ _Jv_StackTrace::accesscontrol_trace_fn (_Jv_UnwindState *state)
_Jv_StackFrame *frame = &state->frames[state->pos];
FillInFrameInfo (frame);
+ if (!(frame->klass && frame->meth))
+ return _URC_NO_REASON;
+
bool *stopping = (bool *) state->trace_data;
if (*stopping)
return _URC_NORMAL_STOP;
if (frame->klass == &::java::security::AccessController::class$
- && frame->meth
&& strcmp (frame->meth->name->chars(), "doPrivileged") == 0)
*stopping = true;
--
GitLab