archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7171703: JNI DefineClass crashes client VM when first parameter is NULL

Browse source 
Reviewed-by: acorn, kamg, sspitsyn, dholmes
This commit is contained in:
Frederic Parain 2012-06-05 06:48:00 -07:00
parent 1ac7879229
commit 911dcf0f08
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hotspot/src/share/vm/prims/jni.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -378,6 +378,7 @@ JNI_ENTRY(jclass, jni_DefineClass(JNIEnv *env, const char *name, jobject loaderR
jclass cls = NULL; jclass cls = NULL;
DT_RETURN_MARK(DefineClass, jclass, (const jclass&)cls); DT_RETURN_MARK(DefineClass, jclass, (const jclass&)cls);
TempNewSymbol class_name = NULL;
// Since exceptions can be thrown, class initialization can take place // Since exceptions can be thrown, class initialization can take place
// if name is NULL no check for class name in .class stream has to be made. // if name is NULL no check for class name in .class stream has to be made.
if (name != NULL) { if (name != NULL) {
@ -387,9 +388,8 @@ JNI_ENTRY(jclass, jni_DefineClass(JNIEnv *env, const char *name, jobject loaderR
// into the constant pool. // into the constant pool.
THROW_MSG_0(vmSymbols::java_lang_NoClassDefFoundError(), name); THROW_MSG_0(vmSymbols::java_lang_NoClassDefFoundError(), name);
} }
class_name = SymbolTable::new_symbol(name, CHECK_NULL);
} }
TempNewSymbol class_name = SymbolTable::new_symbol(name, THREAD);
ResourceMark rm(THREAD); ResourceMark rm(THREAD);
ClassFileStream st((u1*) buf, bufLen, NULL); ClassFileStream st((u1*) buf, bufLen, NULL);
Handle class_loader (THREAD, JNIHandles::resolve(loaderRef)); Handle class_loader (THREAD, JNIHandles::resolve(loaderRef));