natLogger.cc (getCallerStackFrame): Don't crash on NULL klass and meth values from...

2005-04-06  Bryce McKinlay  <mckinlay@redhat.com>

	* java/util/logging/natLogger.cc (getCallerStackFrame): Don't crash
	on NULL klass and meth values from _Jv_StackTrace::GetCallerInfo().

From-SVN: r97739

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c369ea5435682276fc7bc26343a6db926c3e48c8..9343748e09d370382ca9269c755bf2482443f9ce 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -43,7 +43,6 @@
        Handle error cases.  Added 'endp' argument.
        * include/jvm.h (_Jv_FindClassFromSignature): Updated prototype.
 
->>>>>>> 1.3459
 2005-04-05  Tom Tromey  <tromey@redhat.com>
 
        * Makefile.in: Rebuilt.

diff --git a/libjava/java/util/logging/natLogger.cc b/libjava/java/util/logging/natLogger.cc
index e92c487c66f387c8a8566cc7cf4edf9c398180c6..5c68b1722c7b3b660e1bc4849823443dea3cecd6 100644 (file)
--- 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;
 }