/hg/release/icedtea7-forest-2.4/hotspot: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 3b7eb739cbd0 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3b7eb739cbd0
author: dsimms
date: Fri Jan 10 15:38:30 2014 +0100

	8029858: Enhance array copies
	Summary: Just read the source element once
	Reviewed-by: coleenp, ahgross


changeset 69b542696e5b in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=69b542696e5b
author: hseigel
date: Thu Feb 20 13:51:45 2014 -0500

	8034926: Attribute classes properly
	Summary: Add check to prevent underflow
	Reviewed-by: coleenp, ahgross


diffstat:

 src/share/vm/classfile/classFileParser.cpp |  7 ++++++-
 src/share/vm/oops/objArrayKlass.cpp        |  2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 7f4fbcd8815d -r 69b542696e5b src/share/vm/classfile/classFileParser.cpp
--- a/src/share/vm/classfile/classFileParser.cpp	Thu Mar 27 23:21:09 2014 +0000
+++ b/src/share/vm/classfile/classFileParser.cpp	Thu Feb 20 13:51:45 2014 -0500
@@ -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}}
diff -r 7f4fbcd8815d -r 69b542696e5b src/share/vm/oops/objArrayKlass.cpp
--- a/src/share/vm/oops/objArrayKlass.cpp	Thu Mar 27 23:21:09 2014 +0000
+++ b/src/share/vm/oops/objArrayKlass.cpp	Thu Feb 20 13:51:45 2014 -0500
@@ -149,7 +149,7 @@
         if (element_is_null ||
             Klass::cast((new_val->klass()))->is_subtype_of(bound)) {
           bs->write_ref_field_pre(p, new_val);
-          *p = *from;
+          *p = element;
         } else {
           // We must do a barrier to cover the partial copy.
           const size_t pd = pointer_delta(p, dst, (size_t)heapOopSize);