From e3eff25ac18a36ff69e645befd92b88feae050a8 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Wed, 6 Apr 2005 18:42:23 +0100 Subject: natLogger.cc (getCallerStackFrame): Don't crash on NULL klass and meth values from _Jv_StackTrace::GetCallerInfo(). 2005-04-06 Bryce McKinlay * java/util/logging/natLogger.cc (getCallerStackFrame): Don't crash on NULL klass and meth values from _Jv_StackTrace::GetCallerInfo(). From-SVN: r97739 --- libjava/java/util/logging/natLogger.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'libjava/java/util/logging/natLogger.cc') diff --git a/libjava/java/util/logging/natLogger.cc b/libjava/java/util/logging/natLogger.cc index e92c487..5c68b17 100644 --- a/libjava/java/util/logging/natLogger.cc +++ b/libjava/java/util/logging/natLogger.cc @@ -34,10 +34,16 @@ java::util::logging::Logger::getCallerStackFrame () _Jv_Method *meth = NULL; _Jv_StackTrace::GetCallerInfo (&Logger::class$, &klass, &meth); + jstring meth_name = NULL; + jstring klass_name = NULL; + if (klass != NULL) + klass_name = klass->getName(); + if (meth != NULL) + meth_name = _Jv_NewStringUtf8Const (meth->name); + java::lang::StackTraceElement *e = new java::lang::StackTraceElement - (JvNewStringUTF (""), 0, - klass->getName(), _Jv_NewStringUtf8Const (meth->name), false); + (JvNewStringUTF (""), 0, klass_name, meth_name, false); return e; } -- cgit v1.1