changeset 52947:42acc7e03b24 amber-demo

Automatic merge with datum
author mcimadamore
date Wed, 31 Oct 2018 09:49:22 +0100
parents 51aa9496a1dd c9cfa7d5778d
children aa666a24f362
files
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/classfile/classFileParser.cpp	Tue Oct 30 21:16:21 2018 +0100
+++ b/src/hotspot/share/classfile/classFileParser.cpp	Wed Oct 31 09:49:22 2018 +0100
@@ -3451,7 +3451,7 @@
   _inner_classes = Universe::the_empty_short_array();
   // Set nest members attribute to default sentinel
   _nest_members = Universe::the_empty_short_array();
-  // Set nest members attribute to default sentinel
+  // Set record params to default sentinel
   _record_params = Universe::the_empty_short_array();
   cfs->guarantee_more(2, CHECK);  // attributes_count
   u2 attributes_count = cfs->get_u2_fast();
@@ -3672,6 +3672,9 @@
           record_attribute_start = cfs->current();
           record_attribute_length = attribute_length;
           cfs->skip_u1(record_attribute_length, CHECK);
+        } else {
+          // Unknown attribute
+          cfs->skip_u1(attribute_length, CHECK);
         }
       } else {
         // Unknown attribute