# HG changeset patch
# User kamg
# Date 1207844461 14400
# Node ID ebec5b9731e232f1902927dee1bdb69621b26ff0
# Parent  a294fd0c4b38c1f8eee6e73946acaa2cd1cfcc0e
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
Summary: A check on Code length did not take into account the old sizes of the max_stack, max_locals, and code_length.
Reviewed-by: phh, sbohne

diff -r a294fd0c4b38 -r ebec5b9731e2 src/share/vm/classfile/classFileParser.cpp
--- a/src/share/vm/classfile/classFileParser.cpp	Wed Apr 09 14:22:48 2008 -0400
+++ b/src/share/vm/classfile/classFileParser.cpp	Thu Apr 10 12:21:01 2008 -0400
@@ -1359,16 +1359,25 @@
       // Parse additional attributes in code attribute
       cfs->guarantee_more(2, CHECK_(nullHandle));  // code_attributes_count
       u2 code_attributes_count = cfs->get_u2_fast();
-      unsigned int calculated_attribute_length = sizeof(max_stack) +
-                                                 sizeof(max_locals) +
-                                                 sizeof(code_length) +
-                                                 code_length +
-                                                 sizeof(exception_table_length) +
-                                                 sizeof(code_attributes_count) +
-                                                 exception_table_length*(sizeof(u2) /* start_pc */+
-                                                                         sizeof(u2) /* end_pc */  +
-                                                                         sizeof(u2) /* handler_pc */ +
-                                                                         sizeof(u2) /* catch_type_index */);
+
+      unsigned int calculated_attribute_length = 0;
+
+      if (_major_version > 45 || (_major_version == 45 && _minor_version > 2)) {
+        calculated_attribute_length =
+            sizeof(max_stack) + sizeof(max_locals) + sizeof(code_length);
+      } else {
+        // max_stack, locals and length are smaller in pre-version 45.2 classes
+        calculated_attribute_length = sizeof(u1) + sizeof(u1) + sizeof(u2);
+      }
+      calculated_attribute_length +=
+        code_length +
+        sizeof(exception_table_length) +
+        sizeof(code_attributes_count) +
+        exception_table_length *
+            ( sizeof(u2) +   // start_pc
+              sizeof(u2) +   // end_pc
+              sizeof(u2) +   // handler_pc
+              sizeof(u2) );  // catch_type_index
 
       while (code_attributes_count--) {
         cfs->guarantee_more(6, CHECK_(nullHandle));  // code_attribute_name_index, code_attribute_length