Mercurial > hg > truffle
changeset 20355:47e8e40b94d3
Merge
author | hseigel |
---|---|
date | Mon, 25 Aug 2014 17:05:18 -0400 |
parents | 5b662570d9cf (current diff) fa0cf025abd4 (diff) |
children | 439f0d76cff3 4bfc44ba0d19 |
files | |
diffstat | 1 files changed, 1 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.cpp Mon Aug 25 11:19:43 2014 -0700 +++ b/src/share/vm/classfile/classFileParser.cpp Mon Aug 25 17:05:18 2014 -0400 @@ -2780,7 +2780,7 @@ ClassFileStream* cfs = stream(); u1* current_start = cfs->current(); - guarantee_property(attribute_byte_length > sizeof(u2), + guarantee_property(attribute_byte_length >= sizeof(u2), "Invalid BootstrapMethods attribute length %u in class file %s", attribute_byte_length, CHECK); @@ -2793,11 +2793,6 @@ "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); - // The attribute contains a counted array of counted tuples of shorts, // represending bootstrap specifiers: // length*{bootstrap_method_index, argument_count*{argument_index}}