--- a/src/share/vm/classfile/classFileParser.cpp	Wed May 28 12:07:21 2014 -0700
+++ b/src/share/vm/classfile/classFileParser.cpp	Thu May 29 09:56:06 2014 -0700
@@ -2793,6 +2793,11 @@
                      "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}}