* name-finder.cc (lookup): Ignore a null dli_fname from d

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45181 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a058e68..03e66b5 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-26  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
+
+       * name-finder.cc (lookup): Ignore a null dli_fname from dladdr.
+
 2001-08-23  Tom Tromey  <tromey@redhat.com>
 
        * java/lang/reflect/Field.java (toString): Use

diff --git a/libjava/name-finder.cc b/libjava/name-finder.cc
index 3baa6e3..1533e08 100644 (file)
--- a/libjava/name-finder.cc
+++ b/libjava/name-finder.cc
@@ -145,11 +145,13 @@ _Jv_name_finder::lookup (void *p)
     
     if (dladdr (p, &dl_info))
       {
-       strncpy (file_name, dl_info.dli_fname, sizeof file_name);
+        if (dl_info.dli_fname)
+         strncpy (file_name, dl_info.dli_fname, sizeof file_name);
        strncpy (method_name, dl_info.dli_sname, sizeof method_name);
        
        /* Don't trust dladdr() if the address is from the main program. */
-       if (_Jv_argv == NULL || strcmp (file_name, _Jv_argv[0]) != 0)
+       if (dl_info.dli_fname != NULL
+          && (_Jv_argv == NULL || strcmp (file_name, _Jv_argv[0]) != 0))
          return true;
       }
   }