archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-16 17:14:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8232980: Cleanup initialization of function pointers into java.base from classloader.cpp

Browse source 
Reviewed-by: iklam, ccheung
This commit is contained in:
Christoph Langer 2019-11-01 07:58:05 +01:00
parent 04e885b498
commit dae8d44447
2 changed files with 52 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

119
src/hotspot/share/classfile/classLoader.cpp
View file

@ -73,14 +73,17 @@
#include "utilities/hashtable.inline.hpp" #include "utilities/hashtable.inline.hpp"
#include "utilities/macros.hpp" #include "utilities/macros.hpp"
// Entry point in java.dll for path canonicalization
static canonicalize_fn_t CanonicalizeEntry = NULL;
// Entry points in zip.dll for loading zip/jar file entries // Entry points in zip.dll for loading zip/jar file entries
typedef void * * (*ZipOpen_t)(const char *name, char **pmsg); typedef void * * (*ZipOpen_t)(const char *name, char **pmsg);
typedef void (*ZipClose_t)(jzfile *zip); typedef void (*ZipClose_t)(jzfile *zip);
typedef jzentry* (*FindEntry_t)(jzfile *zip, const char *name, jint *sizeP, jint *nameLen); typedef jzentry* (*FindEntry_t)(jzfile *zip, const char *name, jint *sizeP, jint *nameLen);
typedef jboolean (*ReadEntry_t)(jzfile *zip, jzentry *entry, unsigned char *buf, char *namebuf); typedef jboolean (*ReadEntry_t)(jzfile *zip, jzentry *entry, unsigned char *buf, char *namebuf);
typedef jzentry* (*GetNextEntry_t)(jzfile *zip, jint n); typedef jzentry* (*GetNextEntry_t)(jzfile *zip, jint n);
typedef jboolean (*ZipInflateFully_t)(void *inBuf, jlong inLen, void *outBuf, jlong outLen, char **pmsg);
typedef jint (*Crc32_t)(jint crc, const jbyte *buf, jint len); typedef jint (*Crc32_t)(jint crc, const jbyte *buf, jint len);
static ZipOpen_t ZipOpen = NULL; static ZipOpen_t ZipOpen = NULL;
@ -88,8 +91,6 @@ static ZipClose_t ZipClose = NULL;
static FindEntry_t FindEntry = NULL; static FindEntry_t FindEntry = NULL;
static ReadEntry_t ReadEntry = NULL; static ReadEntry_t ReadEntry = NULL;
static GetNextEntry_t GetNextEntry = NULL; static GetNextEntry_t GetNextEntry = NULL;
static canonicalize_fn_t CanonicalizeEntry = NULL;
static ZipInflateFully_t ZipInflateFully = NULL;
static Crc32_t Crc32 = NULL; static Crc32_t Crc32 = NULL;
// Entry points for jimage.dll for loading jimage file entries // Entry points for jimage.dll for loading jimage file entries
@ -295,9 +296,7 @@ ClassPathZipEntry::ClassPathZipEntry(jzfile* zip, const char* zip_name,
} }
ClassPathZipEntry::~ClassPathZipEntry() { ClassPathZipEntry::~ClassPathZipEntry() {
if (ZipClose != NULL) { (*ZipClose)(_zip);
(*ZipClose)(_zip);
}
FREE_C_HEAP_ARRAY(char, _zip_name); FREE_C_HEAP_ARRAY(char, _zip_name);
} }
@ -964,11 +963,28 @@ void ClassLoader::print_bootclasspath() {
tty->print_cr("]"); tty->print_cr("]");
} }
void* ClassLoader::dll_lookup(void* lib, const char* name, const char* path) {
void* func = os::dll_lookup(lib, name);
if (func == NULL) {
char msg[256] = "";
jio_snprintf(msg, sizeof(msg), "Could not resolve \"%s\"", name);
vm_exit_during_initialization(msg, path);
}
return func;
}
void ClassLoader::load_java_library() {
assert(CanonicalizeEntry == NULL, "should not load java library twice");
void *javalib_handle = os::native_java_library();
if (javalib_handle == NULL) {
vm_exit_during_initialization("Unable to load java library", NULL);
}
CanonicalizeEntry = CAST_TO_FN_PTR(canonicalize_fn_t, dll_lookup(javalib_handle, "Canonicalize", NULL));
}
void ClassLoader::load_zip_library() { void ClassLoader::load_zip_library() {
assert(ZipOpen == NULL, "should not load zip library twice"); assert(ZipOpen == NULL, "should not load zip library twice");
// First make sure native library is loaded
os::native_java_library();
// Load zip library
char path[JVM_MAXPATHLEN]; char path[JVM_MAXPATHLEN];
char ebuf[1024]; char ebuf[1024];
void* handle = NULL; void* handle = NULL;
@ -976,37 +992,19 @@ void ClassLoader::load_zip_library() {
handle = os::dll_load(path, ebuf, sizeof ebuf); handle = os::dll_load(path, ebuf, sizeof ebuf);
} }
if (handle == NULL) { if (handle == NULL) {
vm_exit_during_initialization("Unable to load ZIP library", path); vm_exit_during_initialization("Unable to load zip library", path);
}
// Lookup zip entry points
ZipOpen = CAST_TO_FN_PTR(ZipOpen_t, os::dll_lookup(handle, "ZIP_Open"));
ZipClose = CAST_TO_FN_PTR(ZipClose_t, os::dll_lookup(handle, "ZIP_Close"));
FindEntry = CAST_TO_FN_PTR(FindEntry_t, os::dll_lookup(handle, "ZIP_FindEntry"));
ReadEntry = CAST_TO_FN_PTR(ReadEntry_t, os::dll_lookup(handle, "ZIP_ReadEntry"));
GetNextEntry = CAST_TO_FN_PTR(GetNextEntry_t, os::dll_lookup(handle, "ZIP_GetNextEntry"));
ZipInflateFully = CAST_TO_FN_PTR(ZipInflateFully_t, os::dll_lookup(handle, "ZIP_InflateFully"));
Crc32 = CAST_TO_FN_PTR(Crc32_t, os::dll_lookup(handle, "ZIP_CRC32"));
// ZIP_Close is not exported on Windows in JDK5.0 so don't abort if ZIP_Close is NULL
if (ZipOpen == NULL || FindEntry == NULL || ReadEntry == NULL ||
GetNextEntry == NULL || Crc32 == NULL) {
vm_exit_during_initialization("Corrupted ZIP library", path);
} }
if (ZipInflateFully == NULL) { ZipOpen = CAST_TO_FN_PTR(ZipOpen_t, dll_lookup(handle, "ZIP_Open", path));
vm_exit_during_initialization("Corrupted ZIP library ZIP_InflateFully missing", path); ZipClose = CAST_TO_FN_PTR(ZipClose_t, dll_lookup(handle, "ZIP_Close", path));
} FindEntry = CAST_TO_FN_PTR(FindEntry_t, dll_lookup(handle, "ZIP_FindEntry", path));
ReadEntry = CAST_TO_FN_PTR(ReadEntry_t, dll_lookup(handle, "ZIP_ReadEntry", path));
// Lookup canonicalize entry in libjava.dll GetNextEntry = CAST_TO_FN_PTR(GetNextEntry_t, dll_lookup(handle, "ZIP_GetNextEntry", path));
void *javalib_handle = os::native_java_library(); Crc32 = CAST_TO_FN_PTR(Crc32_t, dll_lookup(handle, "ZIP_CRC32", path));
CanonicalizeEntry = CAST_TO_FN_PTR(canonicalize_fn_t, os::dll_lookup(javalib_handle, "Canonicalize"));
// This lookup only works on 1.3. Do not check for non-null here
} }
void ClassLoader::load_jimage_library() { void ClassLoader::load_jimage_library() {
// First make sure native library is loaded assert(JImageOpen == NULL, "should not load jimage library twice");
os::native_java_library();
// Load jimage library
char path[JVM_MAXPATHLEN]; char path[JVM_MAXPATHLEN];
char ebuf[1024]; char ebuf[1024];
void* handle = NULL; void* handle = NULL;
@ -1017,27 +1015,15 @@ void ClassLoader::load_jimage_library() {
vm_exit_during_initialization("Unable to load jimage library", path); vm_exit_during_initialization("Unable to load jimage library", path);
} }
// Lookup jimage entry points JImageOpen = CAST_TO_FN_PTR(JImageOpen_t, dll_lookup(handle, "JIMAGE_Open", path));
JImageOpen = CAST_TO_FN_PTR(JImageOpen_t, os::dll_lookup(handle, "JIMAGE_Open")); JImageClose = CAST_TO_FN_PTR(JImageClose_t, dll_lookup(handle, "JIMAGE_Close", path));
guarantee(JImageOpen != NULL, "function JIMAGE_Open not found"); JImagePackageToModule = CAST_TO_FN_PTR(JImagePackageToModule_t, dll_lookup(handle, "JIMAGE_PackageToModule", path));
JImageClose = CAST_TO_FN_PTR(JImageClose_t, os::dll_lookup(handle, "JIMAGE_Close")); JImageFindResource = CAST_TO_FN_PTR(JImageFindResource_t, dll_lookup(handle, "JIMAGE_FindResource", path));
guarantee(JImageClose != NULL, "function JIMAGE_Close not found"); JImageGetResource = CAST_TO_FN_PTR(JImageGetResource_t, dll_lookup(handle, "JIMAGE_GetResource", path));
JImagePackageToModule = CAST_TO_FN_PTR(JImagePackageToModule_t, os::dll_lookup(handle, "JIMAGE_PackageToModule")); JImageResourceIterator = CAST_TO_FN_PTR(JImageResourceIterator_t, dll_lookup(handle, "JIMAGE_ResourceIterator", path));
guarantee(JImagePackageToModule != NULL, "function JIMAGE_PackageToModule not found");
JImageFindResource = CAST_TO_FN_PTR(JImageFindResource_t, os::dll_lookup(handle, "JIMAGE_FindResource"));
guarantee(JImageFindResource != NULL, "function JIMAGE_FindResource not found");
JImageGetResource = CAST_TO_FN_PTR(JImageGetResource_t, os::dll_lookup(handle, "JIMAGE_GetResource"));
guarantee(JImageGetResource != NULL, "function JIMAGE_GetResource not found");
JImageResourceIterator = CAST_TO_FN_PTR(JImageResourceIterator_t, os::dll_lookup(handle, "JIMAGE_ResourceIterator"));
guarantee(JImageResourceIterator != NULL, "function JIMAGE_ResourceIterator not found");
}
jboolean ClassLoader::decompress(void *in, u8 inSize, void *out, u8 outSize, char **pmsg) {
return (*ZipInflateFully)(in, inSize, out, outSize, pmsg);
} }
int ClassLoader::crc32(int crc, const char* buf, int len) { int ClassLoader::crc32(int crc, const char* buf, int len) {
assert(Crc32 != NULL, "ZIP_CRC32 is not found");
return (*Crc32)(crc, (const jbyte*)buf, len); return (*Crc32)(crc, (const jbyte*)buf, len);
} }
@ -1527,6 +1513,8 @@ void ClassLoader::initialize() {
"unsafeDefineClassCalls"); "unsafeDefineClassCalls");
} }
// lookup java library entry points
load_java_library();
// lookup zip library entry points // lookup zip library entry points
load_zip_library(); load_zip_library();
// jimage library entry points are loaded below, in lookup_vm_options // jimage library entry points are loaded below, in lookup_vm_options
@ -1652,24 +1640,17 @@ void ClassLoader::classLoader_init2(TRAPS) {
} }
} }
bool ClassLoader::get_canonical_path(const 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"); assert(orig != NULL && out != NULL && len > 0, "bad arguments");
if (CanonicalizeEntry != NULL) { JavaThread* THREAD = JavaThread::current();
JavaThread* THREAD = JavaThread::current(); JNIEnv* env = THREAD->jni_environment();
JNIEnv* env = THREAD->jni_environment(); ResourceMark rm(THREAD);
ResourceMark rm(THREAD);
// os::native_path writes into orig_copy // os::native_path writes into orig_copy
char* orig_copy = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, strlen(orig)+1); char* orig_copy = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, strlen(orig)+1);
strcpy(orig_copy, orig); strcpy(orig_copy, orig);
if ((CanonicalizeEntry)(env, os::native_path(orig_copy), out, len) < 0) { if ((CanonicalizeEntry)(env, os::native_path(orig_copy), out, len) < 0) {
return false; return false;
}
} else {
// On JDK 1.2.2 the Canonicalize does not exist, so just do nothing
strncpy(out, orig, len);
out[len - 1] = '\0';
} }
return true; return true;
} }

3
src/hotspot/share/classfile/classLoader.hpp
View file

@ -249,6 +249,8 @@ class ClassLoader: AllStatic {
static void setup_patch_mod_entries(); static void setup_patch_mod_entries();
static void create_javabase(); static void create_javabase();
static void* dll_lookup(void* lib, const char* name, const char* path);
static void load_java_library();
static void load_zip_library(); static void load_zip_library();
static void load_jimage_library(); static void load_jimage_library();
@ -275,7 +277,6 @@ class ClassLoader: AllStatic {
static PackageEntry* get_package_entry(const char* class_name, ClassLoaderData* loader_data, TRAPS); static PackageEntry* get_package_entry(const char* class_name, ClassLoaderData* loader_data, TRAPS);
public: public:
static jboolean decompress(void *in, u8 inSize, void *out, u8 outSize, char **pmsg);
static int crc32(int crc, const char* buf, int len); static int crc32(int crc, const char* buf, int len);
static bool update_class_path_entry_list(const char *path, static bool update_class_path_entry_list(const char *path,
bool check_for_duplicates, bool check_for_duplicates,