/hg/release/icedtea7-forest-2.4/hotspot: 8 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jul 15 21:21:46 UTC 2014
changeset 8c5a16aafb22 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8c5a16aafb22
author: hseigel
date: Fri Feb 14 12:07:27 2014 -0500
8030763: Validate global memory allocation
Summary: Add length checks where necessary
Reviewed-by: coleenp, mschoene
changeset 9d49f3448114 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9d49f3448114
author: hseigel
date: Tue Mar 04 15:58:08 2014 -0500
8032536: JVM resolves wrong method in some unusual cases
Summary: Handle package private case
Reviewed-by: coleenp, acorn, jdn
changeset 6406d31bdc1a in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6406d31bdc1a
author: hseigel
date: Thu Mar 20 08:46:41 2014 -0400
8034985: Better form for Lambda Forms
Summary: Only allow classes loaded by boot or extensions class loaders, or anonymous classes, to access privileged annotations.
Reviewed-by: coleenp, ahgross, twisti
changeset 7d83f2b1a320 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7d83f2b1a320
author: hseigel
date: Wed Mar 19 18:04:09 2014 -0400
8035119: Fix exceptions to bytecode verification
Summary: Prevent ctor calls to super() and this() from avoidable code (try blocks, if stmts, etc.)
Reviewed-by: coleenp, acorn, mschoene
changeset 1b26554a2629 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1b26554a2629
author: hseigel
date: Wed Mar 19 14:18:19 2014 -0400
8036800: Attribute OOM to correct part of code
Summary: checks that the attribute_length does not exceed the length of remaining data in the class file
Reviewed-by: coleenp, ahgross
changeset dc7d4b1afcc0 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=dc7d4b1afcc0
author: coleenp
date: Fri Apr 04 13:37:56 2014 -0500
8037076: Check constant pool constants
Summary: Fix events log string.
Reviewed-by: kvn, mschoene
Contributed-by: paul.nauman at oracle.com
changeset 2afa33b89a0f in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2afa33b89a0f
author: hseigel
date: Mon Apr 07 09:22:54 2014 -0400
8037157: Verify <init> call
Summary: Check for null method
Reviewed-by: coleenp, acorn, mschoene
changeset 6f93cec20d27 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6f93cec20d27
author: acorn
date: Tue Apr 15 15:10:07 2014 -0500
8037167: Better method signature resolution
Reviewed-by: mschoene, hseigel, lfoltan
Contributed-by: paul.nauman at oracle.com
diffstat:
src/os/bsd/vm/os_bsd.cpp | 8 +--
src/os/linux/vm/os_linux.cpp | 8 +--
src/os/solaris/vm/os_solaris.cpp | 8 +--
src/os/windows/vm/os_windows.cpp | 46 +++++++-----------
src/share/vm/classfile/classFileParser.cpp | 72 ++++++++++++++++++++---------
src/share/vm/classfile/classFileParser.hpp | 24 ++++++---
src/share/vm/classfile/stackMapTable.cpp | 3 +-
src/share/vm/classfile/verifier.cpp | 33 +++++++++++++-
src/share/vm/classfile/verifier.hpp | 19 +++++++-
src/share/vm/compiler/compileBroker.cpp | 3 +-
src/share/vm/oops/klassVtable.cpp | 27 ++++++++++-
src/share/vm/runtime/os.hpp | 5 +-
src/share/vm/utilities/events.cpp | 6 +-
src/share/vm/utilities/vmError.cpp | 3 +-
14 files changed, 175 insertions(+), 90 deletions(-)
diffs (truncated from 711 to 500 lines):
diff -r ffef4049ab32 -r 6f93cec20d27 src/os/bsd/vm/os_bsd.cpp
--- a/src/os/bsd/vm/os_bsd.cpp Fri May 16 16:39:47 2014 +0100
+++ b/src/os/bsd/vm/os_bsd.cpp Tue Apr 15 15:10:07 2014 -0500
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1819,9 +1819,6 @@
::abort();
}
-// unused on bsd for now.
-void os::set_error_file(const char *logfile) {}
-
// This method is a copy of JDK's sysGetLastErrorString
// from src/solaris/hpi/src/system_md.c
@@ -2585,6 +2582,7 @@
// determine if this is a legacy image or modules image
// modules image doesn't have "jre" subdirectory
len = strlen(buf);
+ assert(len < buflen, "Ran out of buffer space");
jrelib_p = buf + len;
// Add the appropriate library subdir
@@ -2620,7 +2618,7 @@
}
}
- strcpy(saved_jvm_path, buf);
+ strncpy(saved_jvm_path, buf, MAXPATHLEN);
}
void os::print_jni_name_prefix_on(outputStream* st, int args_size) {
diff -r ffef4049ab32 -r 6f93cec20d27 src/os/linux/vm/os_linux.cpp
--- a/src/os/linux/vm/os_linux.cpp Fri May 16 16:39:47 2014 +0100
+++ b/src/os/linux/vm/os_linux.cpp Tue Apr 15 15:10:07 2014 -0500
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1603,9 +1603,6 @@
::abort();
}
-// unused on linux for now.
-void os::set_error_file(const char *logfile) {}
-
// This method is a copy of JDK's sysGetLastErrorString
// from src/solaris/hpi/src/system_md.c
@@ -2440,6 +2437,7 @@
// determine if this is a legacy image or modules image
// modules image doesn't have "jre" subdirectory
len = strlen(buf);
+ assert(len < buflen, "Ran out of buffer room");
jrelib_p = buf + len;
snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch);
if (0 != access(buf, F_OK)) {
@@ -2462,7 +2460,7 @@
}
}
- strcpy(saved_jvm_path, buf);
+ strncpy(saved_jvm_path, buf, MAXPATHLEN);
}
void os::print_jni_name_prefix_on(outputStream* st, int args_size) {
diff -r ffef4049ab32 -r 6f93cec20d27 src/os/solaris/vm/os_solaris.cpp
--- a/src/os/solaris/vm/os_solaris.cpp Fri May 16 16:39:47 2014 +0100
+++ b/src/os/solaris/vm/os_solaris.cpp Tue Apr 15 15:10:07 2014 -0500
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1877,9 +1877,6 @@
::abort(); // dump core (for debugging)
}
-// unused
-void os::set_error_file(const char *logfile) {}
-
// DLL functions
const char* os::dll_file_extension() { return ".so"; }
@@ -2561,6 +2558,7 @@
// determine if this is a legacy image or modules image
// modules image doesn't have "jre" subdirectory
len = strlen(buf);
+ assert(len < buflen, "Ran out of buffer space");
jrelib_p = buf + len;
snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch);
if (0 != access(buf, F_OK)) {
@@ -2581,7 +2579,7 @@
}
}
- strcpy(saved_jvm_path, buf);
+ strncpy(saved_jvm_path, buf, MAXPATHLEN);
}
diff -r ffef4049ab32 -r 6f93cec20d27 src/os/windows/vm/os_windows.cpp
--- a/src/os/windows/vm/os_windows.cpp Fri May 16 16:39:47 2014 +0100
+++ b/src/os/windows/vm/os_windows.cpp Tue Apr 15 15:10:07 2014 -0500
@@ -1767,27 +1767,28 @@
// libjvm.so is installed there (append a fake suffix
// hotspot/libjvm.so).
char* java_home_var = ::getenv("JAVA_HOME");
- if (java_home_var != NULL && java_home_var[0] != 0) {
-
- strncpy(buf, java_home_var, buflen);
-
- // determine if this is a legacy image or modules image
- // modules image doesn't have "jre" subdirectory
- size_t len = strlen(buf);
- char* jrebin_p = buf + len;
- jio_snprintf(jrebin_p, buflen-len, "\\jre\\bin\\");
- if (0 != _access(buf, 0)) {
- jio_snprintf(jrebin_p, buflen-len, "\\bin\\");
- }
- len = strlen(buf);
- jio_snprintf(buf + len, buflen-len, "hotspot\\jvm.dll");
+ if (java_home_var != NULL && java_home_var[0] != 0 &&
+ strlen(java_home_var) < (size_t)buflen) {
+
+ strncpy(buf, java_home_var, buflen);
+
+ // determine if this is a legacy image or modules image
+ // modules image doesn't have "jre" subdirectory
+ size_t len = strlen(buf);
+ char* jrebin_p = buf + len;
+ jio_snprintf(jrebin_p, buflen-len, "\\jre\\bin\\");
+ if (0 != _access(buf, 0)) {
+ jio_snprintf(jrebin_p, buflen-len, "\\bin\\");
+ }
+ len = strlen(buf);
+ jio_snprintf(buf + len, buflen-len, "hotspot\\jvm.dll");
}
}
if(buf[0] == '\0') {
- GetModuleFileName(vm_lib_handle, buf, buflen);
- }
- strcpy(saved_jvm_path, buf);
+ GetModuleFileName(vm_lib_handle, buf, buflen);
+ }
+ strncpy(saved_jvm_path, buf, MAX_PATH);
}
@@ -2212,17 +2213,6 @@
#endif //_WIN64
-// Fatal error reporting is single threaded so we can make this a
-// static and preallocated. If it's more than MAX_PATH silently ignore
-// it.
-static char saved_error_file[MAX_PATH] = {0};
-
-void os::set_error_file(const char *logfile) {
- if (strlen(logfile) <= MAX_PATH) {
- strncpy(saved_error_file, logfile, MAX_PATH);
- }
-}
-
static inline void report_error(Thread* t, DWORD exception_code,
address addr, void* siginfo, void* context) {
VMError err(t, exception_code, addr, siginfo, context);
diff -r ffef4049ab32 -r 6f93cec20d27 src/share/vm/classfile/classFileParser.cpp
--- a/src/share/vm/classfile/classFileParser.cpp Fri May 16 16:39:47 2014 +0100
+++ b/src/share/vm/classfile/classFileParser.cpp Tue Apr 15 15:10:07 2014 -0500
@@ -961,7 +961,7 @@
"Wrong size %u for field's Signature attribute in class file %s",
attribute_length, CHECK);
}
- generic_signature_index = cfs->get_u2(CHECK);
+ generic_signature_index = parse_generic_signature_attribute(cp, CHECK);
} else if (attribute_name == vmSymbols::tag_runtime_visible_annotations()) {
runtime_visible_annotations_length = attribute_length;
runtime_visible_annotations = cfs->get_u1_buffer();
@@ -1698,7 +1698,8 @@
}
// Sift through annotations, looking for those significant to the VM:
-void ClassFileParser::parse_annotations(u1* buffer, int limit,
+void ClassFileParser::parse_annotations(Handle class_loader,
+ u1* buffer, int limit,
constantPoolHandle cp,
ClassFileParser::AnnotationCollector* coll,
TRAPS) {
@@ -1736,7 +1737,7 @@
}
// Here is where parsing particular annotations will take place.
- AnnotationCollector::ID id = coll->annotation_index(aname);
+ AnnotationCollector::ID id = coll->annotation_index(class_loader, is_anonymous(), aname);
if (id == AnnotationCollector::_unknown) continue;
coll->set_annotation(id);
// If there are no values, just set the bit and move on:
@@ -1765,20 +1766,30 @@
}
}
-ClassFileParser::AnnotationCollector::ID ClassFileParser::AnnotationCollector::annotation_index(Symbol* name) {
+ClassFileParser::AnnotationCollector::ID ClassFileParser::AnnotationCollector::annotation_index(Handle class_loader,
+ bool is_anonymous,
+ Symbol* name) {
vmSymbols::SID sid = vmSymbols::find_sid(name);
+ // Privileged code can use all annotations. Other code silently drops some.
+ const bool privileged = class_loader.is_null() || is_anonymous ||
+ class_loader()->klass()->klass_part()->name() ==
+ vmSymbols::sun_misc_Launcher_ExtClassLoader();
switch (sid) {
case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_ForceInline_signature):
if (_location != _in_method) break; // only allow for methods
+ if (!privileged) break; // only allow in privileged code
return _method_ForceInline;
case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_DontInline_signature):
if (_location != _in_method) break; // only allow for methods
+ if (!privileged) break; // only allow in privileged code
return _method_DontInline;
case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Compiled_signature):
if (_location != _in_method) break; // only allow for methods
+ if (!privileged) break; // only allow in privileged code
return _method_LambdaForm_Compiled;
case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Hidden_signature):
if (_location != _in_method) break; // only allow for methods
+ if (!privileged) break; // only allow in privileged code
return _method_LambdaForm_Hidden;
default: break;
}
@@ -1818,8 +1829,8 @@
// from the method back up to the containing klass. These flag values
// are added to klass's access_flags.
-methodHandle ClassFileParser::parse_method(constantPoolHandle cp, bool is_interface,
- AccessFlags *promoted_flags,
+methodHandle ClassFileParser::parse_method(Handle class_loader, constantPoolHandle cp,
+ bool is_interface, AccessFlags *promoted_flags,
typeArrayHandle* method_annotations,
typeArrayHandle* method_parameter_annotations,
typeArrayHandle* method_default_annotations,
@@ -2122,13 +2133,12 @@
"Invalid Signature attribute length %u in class file %s",
method_attribute_length, CHECK_(nullHandle));
}
- cfs->guarantee_more(2, CHECK_(nullHandle)); // generic_signature_index
- generic_signature_index = cfs->get_u2_fast();
+ generic_signature_index = parse_generic_signature_attribute(cp, CHECK_(nullHandle));
} else if (method_attribute_name == vmSymbols::tag_runtime_visible_annotations()) {
runtime_visible_annotations_length = method_attribute_length;
runtime_visible_annotations = cfs->get_u1_buffer();
assert(runtime_visible_annotations != NULL, "null visible annotations");
- parse_annotations(runtime_visible_annotations, runtime_visible_annotations_length, cp, &parsed_annotations, CHECK_(nullHandle));
+ parse_annotations(class_loader, runtime_visible_annotations, runtime_visible_annotations_length, cp, &parsed_annotations, CHECK_(nullHandle));
cfs->skip_u1(runtime_visible_annotations_length, CHECK_(nullHandle));
} else if (PreserveAllAnnotations && method_attribute_name == vmSymbols::tag_runtime_invisible_annotations()) {
runtime_invisible_annotations_length = method_attribute_length;
@@ -2357,8 +2367,8 @@
// from the methods back up to the containing klass. These flag values
// are added to klass's access_flags.
-objArrayHandle ClassFileParser::parse_methods(constantPoolHandle cp, bool is_interface,
- AccessFlags* promoted_flags,
+objArrayHandle ClassFileParser::parse_methods(Handle class_loader, constantPoolHandle cp,
+ bool is_interface, AccessFlags* promoted_flags,
bool* has_final_method,
objArrayOop* methods_annotations_oop,
objArrayOop* methods_parameter_annotations_oop,
@@ -2381,7 +2391,8 @@
objArrayHandle methods_parameter_annotations;
objArrayHandle methods_default_annotations;
for (int index = 0; index < length; index++) {
- methodHandle method = parse_method(cp, is_interface,
+ methodHandle method = parse_method(class_loader, cp,
+ is_interface,
promoted_flags,
&method_annotations,
&method_parameter_annotations,
@@ -2490,6 +2501,17 @@
}
}
+// Parse generic_signature attribute for methods and fields
+u2 ClassFileParser::parse_generic_signature_attribute(constantPoolHandle cp, TRAPS) {
+ ClassFileStream* cfs = stream();
+ cfs->guarantee_more(2, CHECK_0); // generic_signature_index
+ u2 generic_signature_index = cfs->get_u2_fast();
+ check_property(
+ valid_symbol_at(cp, generic_signature_index),
+ "Invalid Signature attribute at constant pool index %u in class file %s",
+ generic_signature_index, CHECK_0);
+ return generic_signature_index;
+}
void ClassFileParser::parse_classfile_sourcefile_attribute(constantPoolHandle cp, TRAPS) {
ClassFileStream* cfs = stream();
@@ -2654,18 +2676,19 @@
ClassFileStream* cfs = stream();
u1* current_start = cfs->current();
- cfs->guarantee_more(2, CHECK); // length
- int attribute_array_length = cfs->get_u2_fast();
-
- guarantee_property(_max_bootstrap_specifier_index < attribute_array_length,
- "Short length on BootstrapMethods in class file %s",
- CHECK);
-
guarantee_property(attribute_byte_length > sizeof(u2),
"Invalid BootstrapMethods attribute length %u in class file %s",
attribute_byte_length,
CHECK);
+ cfs->guarantee_more(attribute_byte_length, CHECK);
+
+ int attribute_array_length = cfs->get_u2_fast();
+
+ guarantee_property(_max_bootstrap_specifier_index < attribute_array_length,
+ "Short length on BootstrapMethods in class file %s",
+ CHECK);
+
// The attribute contains a counted array of counted tuples of shorts,
// represending bootstrap specifiers:
// length*{bootstrap_method_index, argument_count*{argument_index}}
@@ -2726,7 +2749,8 @@
}
-void ClassFileParser::parse_classfile_attributes(constantPoolHandle cp,
+void ClassFileParser::parse_classfile_attributes(Handle class_loader,
+ constantPoolHandle cp,
ClassFileParser::ClassAnnotationCollector* parsed_annotations,
TRAPS) {
ClassFileStream* cfs = stream();
@@ -2809,7 +2833,8 @@
runtime_visible_annotations_length = attribute_length;
runtime_visible_annotations = cfs->get_u1_buffer();
assert(runtime_visible_annotations != NULL, "null visible annotations");
- parse_annotations(runtime_visible_annotations,
+ parse_annotations(class_loader,
+ runtime_visible_annotations,
runtime_visible_annotations_length,
cp,
parsed_annotations,
@@ -3172,7 +3197,8 @@
objArrayOop methods_annotations_oop = NULL;
objArrayOop methods_parameter_annotations_oop = NULL;
objArrayOop methods_default_annotations_oop = NULL;
- objArrayHandle methods = parse_methods(cp, access_flags.is_interface(),
+ objArrayHandle methods = parse_methods(class_loader, cp,
+ access_flags.is_interface(),
&promoted_flags,
&has_final_method,
&methods_annotations_oop,
@@ -3186,7 +3212,7 @@
// Additional attributes
ClassAnnotationCollector parsed_annotations;
- parse_classfile_attributes(cp, &parsed_annotations, CHECK_(nullHandle));
+ parse_classfile_attributes(class_loader, cp, &parsed_annotations, CHECK_(nullHandle));
// Make sure this is the end of class file stream
guarantee_property(cfs->at_eos(), "Extra bytes at the end of class file %s", CHECK_(nullHandle));
diff -r ffef4049ab32 -r 6f93cec20d27 src/share/vm/classfile/classFileParser.hpp
--- a/src/share/vm/classfile/classFileParser.hpp Fri May 16 16:39:47 2014 +0100
+++ b/src/share/vm/classfile/classFileParser.hpp Tue Apr 15 15:10:07 2014 -0500
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -102,7 +102,7 @@
assert((int)_annotation_LIMIT <= (int)sizeof(_annotations_present) * BitsPerByte, "");
}
// If this annotation name has an ID, report it (or _none).
- ID annotation_index(Symbol* name);
+ ID annotation_index(Handle class_loader, bool is_anonymous, Symbol* name);
// Set the annotation name:
void set_annotation(ID id) {
assert((int)id >= 0 && (int)id < (int)_annotation_LIMIT, "oob");
@@ -169,14 +169,14 @@
u2* java_fields_count_ptr, TRAPS);
// Method parsing
- methodHandle parse_method(constantPoolHandle cp, bool is_interface,
- AccessFlags* promoted_flags,
+ methodHandle parse_method(Handle class_loader, constantPoolHandle cp,
+ bool is_interface, AccessFlags* promoted_flags,
typeArrayHandle* method_annotations,
typeArrayHandle* method_parameter_annotations,
typeArrayHandle* method_default_annotations,
TRAPS);
- objArrayHandle parse_methods (constantPoolHandle cp, bool is_interface,
- AccessFlags* promoted_flags,
+ objArrayHandle parse_methods (Handle class_loader, constantPoolHandle cp,
+ bool is_interface, AccessFlags* promoted_flags,
bool* has_final_method,
objArrayOop* methods_annotations_oop,
objArrayOop* methods_parameter_annotations_oop,
@@ -202,6 +202,7 @@
typeArrayOop parse_stackmap_table(u4 code_attribute_length, TRAPS);
// Classfile attribute parsing
+ u2 parse_generic_signature_attribute(constantPoolHandle cp, TRAPS);
void parse_classfile_sourcefile_attribute(constantPoolHandle cp, TRAPS);
void parse_classfile_source_debug_extension_attribute(constantPoolHandle cp, int length, TRAPS);
u2 parse_classfile_inner_classes_attribute(u1* inner_classes_attribute_start,
@@ -210,7 +211,8 @@
u2 enclosing_method_method_index,
constantPoolHandle cp,
TRAPS);
- void parse_classfile_attributes(constantPoolHandle cp,
+ void parse_classfile_attributes(Handle class_loader,
+ constantPoolHandle cp,
ClassAnnotationCollector* parsed_annotations,
TRAPS);
void parse_classfile_synthetic_attribute(constantPoolHandle cp, TRAPS);
@@ -224,7 +226,7 @@
int runtime_invisible_annotations_length, TRAPS);
int skip_annotation(u1* buffer, int limit, int index);
int skip_annotation_value(u1* buffer, int limit, int index);
- void parse_annotations(u1* buffer, int limit, constantPoolHandle cp,
+ void parse_annotations(Handle class_loader, u1* buffer, int limit, constantPoolHandle cp,
/* Results (currently, only one result is supported): */
AnnotationCollector* result,
TRAPS);
@@ -335,6 +337,12 @@
: cp->tag_at(index).is_klass_reference());
}
+ // Checks that the cpool index is in range and is a utf8
+ bool valid_symbol_at(constantPoolHandle cp, int cpool_index) {
+ return (cp->is_within_bounds(cpool_index) &&
+ cp->tag_at(cpool_index).is_utf8());
+ }
+
public:
// Constructor
ClassFileParser(ClassFileStream* st) { set_stream(st); }
diff -r ffef4049ab32 -r 6f93cec20d27 src/share/vm/classfile/stackMapTable.cpp
--- a/src/share/vm/classfile/stackMapTable.cpp Fri May 16 16:39:47 2014 +0100
+++ b/src/share/vm/classfile/stackMapTable.cpp Tue Apr 15 15:10:07 2014 -0500
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -134,6 +134,7 @@
}
// check if uninitialized objects exist on backward branches
check_new_object(frame, target, CHECK_VERIFY(frame->verifier()));
+ frame->verifier()->update_furthest_jump(target);
}
void StackMapTable::check_new_object(
diff -r ffef4049ab32 -r 6f93cec20d27 src/share/vm/classfile/verifier.cpp
--- a/src/share/vm/classfile/verifier.cpp Fri May 16 16:39:47 2014 +0100
+++ b/src/share/vm/classfile/verifier.cpp Tue Apr 15 15:10:07 2014 -0500
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -629,6 +629,9 @@
bool no_control_flow = false; // Set to true when there is no direct control
// flow from current instruction to the next
// instruction in sequence
+
+ set_furthest_jump(0);
+
Bytecodes::Code opcode;
while (!bcs.is_last_bytecode()) {
// Check for recursive re-verification before each bytecode.
@@ -2239,6 +2242,29 @@
"Bad <init> method call");
return;
}
+
+ // Make sure that this call is not jumped over.
+ if (bci < furthest_jump()) {
+ verify_error(ErrorContext::bad_code(bci),
+ "Bad <init> method call from inside of a branch");
+ return;
+ }
More information about the distro-pkg-dev
mailing list