Mercurial > hg > release > icedtea7-forest-2.5 > hotspot
changeset 5487:a133b4873886
Merge
author | asaha |
---|---|
date | Thu, 20 Feb 2014 15:09:32 -0800 |
parents | 77d04d419019 (current diff) 96d38216303f (diff) |
children | 75a5b21398a3 |
files | |
diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.cpp Thu Feb 20 08:56:21 2014 -0800 +++ b/src/share/vm/classfile/classFileParser.cpp Thu Feb 20 15:09:32 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -2661,6 +2661,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}}