Mercurial > hg > openjdk > jdk6 > hotspot

changeset 4071:47576e4642da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8041717: Issue with class file parser Summary: Add better checking for bad values. Reviewed-by: coleenp, lfoltan, mschoene
author hseigel
date Fri, 30 May 2014 13:38:44 -0400
parents 1f93843b5220
children 14c39813a55e
files src/share/vm/classfile/classFileParser.cpp
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.cpp	Wed Jun 18 18:30:08 2014 +0200
+++ b/src/share/vm/classfile/classFileParser.cpp	Fri May 30 13:38:44 2014 -0400
@@ -2464,6 +2464,11 @@
       "bootstrap_method_index %u has bad constant type in class file %s",
       bootstrap_method_index,
       CHECK);
+
+    guarantee_property((operand_fill_index + 1 + argument_count) < operands->length(),
+      "Invalid BootstrapMethods num_bootstrap_methods or num_bootstrap_arguments value in class file %s",
+      CHECK);
+
     operands->short_at_put(operand_fill_index++, bootstrap_method_index);
     operands->short_at_put(operand_fill_index++, argument_count);
 
@@ -2481,7 +2486,6 @@
   }
 
   assert(operand_fill_index == operands()->length(), "exact fill");
-  assert(constantPoolOopDesc::operand_array_length(operands()) == attribute_array_length, "correct decode");
 
   u1* current_end = cfs->current();
   guarantee_property(current_end == current_start + attribute_byte_length,