aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2000-11-23 05:45:47 +0000
committerBryce McKinlay <bryce@gcc.gnu.org>2000-11-23 05:45:47 +0000
commitabb32cf595ff0a80ad20a8cf30c4590fc3031857 (patch)
tree8b52dd6c1b7167d6f135dc6e267bf73fdff9d1d5 /libjava
parente11cddeceab32df198b679c8c9f4347ef7f761e2 (diff)
downloadgcc-abb32cf595ff0a80ad20a8cf30c4590fc3031857.zip
gcc-abb32cf595ff0a80ad20a8cf30c4590fc3031857.tar.gz
gcc-abb32cf595ff0a80ad20a8cf30c4590fc3031857.tar.bz2
name-finder.cc (lookup): Check for a NULL _Jv_argv before attempting lookup.
2000-11-23 Mark Wielaard <mark@klomp.org> * name-finder.cc (lookup): Check for a NULL _Jv_argv before attempting lookup. From-SVN: r37687
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog7
-rw-r--r--libjava/name-finder.cc2
2 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c5cd9cd..d9ea6b5 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-23 Mark Wielaard <mark@klomp.org>
+
+ * name-finder.cc (lookup): Check for a NULL _Jv_argv before attempting
+ lookup.
+
2000-11-23 Bryce McKinlay <bryce@albatross.co.nz>
* java/util/Vector.java: Improve exception messages.
@@ -58,7 +63,7 @@
* java/text/StringCharacterIterator.java: Reindented.
(setText): New method.
-2000-11-17 Mark Wielaar <mark@klomp.org>
+2000-11-17 Mark Wielaard <mark@klomp.org>
Merge with Classpath (changes by Bryce McKinlay)
* java/util/jar/*.java: Reformat all to unofficial standard coding
diff --git a/libjava/name-finder.cc b/libjava/name-finder.cc
index a29f5bd..3baa6e3 100644
--- a/libjava/name-finder.cc
+++ b/libjava/name-finder.cc
@@ -149,7 +149,7 @@ _Jv_name_finder::lookup (void *p)
strncpy (method_name, dl_info.dli_sname, sizeof method_name);
/* Don't trust dladdr() if the address is from the main program. */
- if (strcmp (file_name, _Jv_argv[0]) != 0)
+ if (_Jv_argv == NULL || strcmp (file_name, _Jv_argv[0]) != 0)
return true;
}
}