jdk-sandbox: comparison hotspot/src/share/vm/classfile/classLoader.cpp

equal deleted inserted replaced

-:16ac9bcf600a
+:25abc4a3285c
 bool ClassPathEntry::is_lazy() {
 return false;
 }
-ClassPathDirEntry::ClassPathDirEntry(char* dir) : ClassPathEntry() {
+ClassPathDirEntry::ClassPathDirEntry(const char* dir) : ClassPathEntry() {
-_dir = NEW_C_HEAP_ARRAY(char, strlen(dir)+1, mtClass);
+char* copy = NEW_C_HEAP_ARRAY(char, strlen(dir)+1, mtClass);
-strcpy(_dir, dir);
+strcpy(copy, dir);
+_dir = copy;
 }
 ClassFileStream* ClassPathDirEntry::open_stream(const char* name, TRAPS) {
 // construct full path name
 }
 ClassPathZipEntry::ClassPathZipEntry(jzfile* zip, const char* zip_name) : ClassPathEntry() {
 _zip = zip;
-_zip_name = NEW_C_HEAP_ARRAY(char, strlen(zip_name)+1, mtClass);
+char *copy = NEW_C_HEAP_ARRAY(char, strlen(zip_name)+1, mtClass);
-strcpy(_zip_name, zip_name);
+strcpy(copy, zip_name);
+_zip_name = copy;
 }
 ClassPathZipEntry::~ClassPathZipEntry() {
 if (ZipClose != NULL) {
 (*ZipClose)(_zip);
 if (ze == NULL) break;
 (*f)(ze->name, context);
 }
 }
-LazyClassPathEntry::LazyClassPathEntry(char* path, const struct stat* st, bool throw_exception) : ClassPathEntry() {
+LazyClassPathEntry::LazyClassPathEntry(const char* path, const struct stat* st, bool throw_exception) : ClassPathEntry() {
 _path = os::strdup_check_oom(path);
 _st = *st;
 _meta_index = NULL;
 _resolved_entry = NULL;
 _has_error = false;
 _throw_exception = throw_exception;
 }
 LazyClassPathEntry::~LazyClassPathEntry() {
-os::free(_path);
+os::free((void*)_path);
 }
 bool LazyClassPathEntry::is_jar_file() {
 return ((_st.st_mode & S_IFREG) == S_IFREG);
 }
 }
 #endif
 void ClassLoader::setup_bootstrap_search_path() {
 assert(_first_entry == NULL, "should not setup bootstrap class search path twice");
-char* sys_class_path = os::strdup_check_oom(Arguments::get_sysclasspath());
+const char* sys_class_path = Arguments::get_sysclasspath();
-if (!PrintSharedArchiveAndExit) {
+if (PrintSharedArchiveAndExit) {
+// Don't print sys_class_path - this is the bootcp of this current VM process, not necessarily
+// the same as the bootcp of the shared archive.
+} else {
 trace_class_path("[Bootstrap loader class path=", sys_class_path);
 }
 #if INCLUDE_CDS
 if (DumpSharedSpaces) {
-_shared_paths_misc_info->add_boot_classpath(Arguments::get_sysclasspath());
+_shared_paths_misc_info->add_boot_classpath(sys_class_path);
 }
 #endif
 setup_search_path(sys_class_path);
-os::free(sys_class_path);
 }
 #if INCLUDE_CDS
 int ClassLoader::get_shared_paths_misc_info_size() {
 return _shared_paths_misc_info->get_used_bytes();
 delete checker;
 return result;
 }
 #endif
-void ClassLoader::setup_search_path(char *class_path) {
+void ClassLoader::setup_search_path(const char *class_path) {
 int offset = 0;
 int len = (int)strlen(class_path);
 int end = 0;
 // Iterate over class path entries
 end++;
 }
 }
 }
-ClassPathEntry* ClassLoader::create_class_path_entry(char *path, const struct stat* st,
+ClassPathEntry* ClassLoader::create_class_path_entry(const char *path, const struct stat* st,
 bool lazy, bool throw_exception, TRAPS) {
 JavaThread* thread = JavaThread::current();
 if (lazy) {
 return new LazyClassPathEntry(path, st, throw_exception);
 }
 ClassPathZipEntry* ClassLoader::create_class_path_zip_entry(const char *path) {
 // check for a regular file
 struct stat st;
 if (os::stat(path, &st) == 0) {
 if ((st.st_mode & S_IFREG) == S_IFREG) {
-char orig_path[JVM_MAXPATHLEN];
 char canonical_path[JVM_MAXPATHLEN];
+if (get_canonical_path(path, canonical_path, JVM_MAXPATHLEN)) {
-strcpy(orig_path, path);
-if (get_canonical_path(orig_path, canonical_path, JVM_MAXPATHLEN)) {
 char* error_msg = NULL;
 jzfile* zip;
 {
 // enable call to C land
 JavaThread* thread = JavaThread::current();
 }
 _num_entries ++;
 }
 // Returns true IFF the file/dir exists and the entry was successfully created.
-bool ClassLoader::update_class_path_entry_list(char *path,
+bool ClassLoader::update_class_path_entry_list(const char *path,
 bool check_for_duplicates,
 bool throw_exception) {
 struct stat st;
 if (os::stat(path, &st) == 0) {
 // File or directory found
 } else {
 #if INCLUDE_CDS
 if (DumpSharedSpaces) {
 _shared_paths_misc_info->add_nonexist_path(path);
 }
+#endif
 return false;
-#endif
 }
 }
 void ClassLoader::print_bootclasspath() {
 ClassPathEntry* e = _first_entry;
 void classLoader_init() {
 ClassLoader::initialize();
 }
-bool ClassLoader::get_canonical_path(char* orig, char* out, int len) {
+bool ClassLoader::get_canonical_path(const char* orig, char* out, int len) {
 assert(orig != NULL && out != NULL && len > 0, "bad arguments");
 if (CanonicalizeEntry != NULL) {
-JNIEnv* env = JavaThread::current()->jni_environment();
+JavaThread* THREAD = JavaThread::current();
-if ((CanonicalizeEntry)(env, os::native_path(orig), out, len) < 0) {
+JNIEnv* env = THREAD->jni_environment();
+ResourceMark rm(THREAD);
+// os::native_path writes into orig_copy
+char* orig_copy = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, strlen(orig)+1);
+strcpy(orig_copy, orig);
+if ((CanonicalizeEntry)(env, os::native_path(orig_copy), out, len) < 0) {
 return false;
 }
 } else {
 // On JDK 1.2.2 the Canonicalize does not exist, so just do nothing
 strncpy(out, orig, len);

changeset 26419	25abc4a3285c
parent 26135	82b516c550f7
child 26583	2ef7b85da46b