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

[andrew at icedtea.classpath.org]

changeset 8f3c9cf0636f in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=8f3c9cf0636f
author: aph
date: Fri Jan 16 09:15:22 2015 +0100

	6584008, PR2193, RH1173326: jvmtiStringPrimitiveCallback should not be invoked when string value is null
	Reviewed-by: sla, sspitsyn


changeset 436b85007718 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=436b85007718
author: andrew
date: Thu Feb 05 16:11:14 2015 +0000

	Added tag icedtea-2.6pre19 for changeset 8f3c9cf0636f


diffstat:

 .hgtags                            |  1 +
 src/share/vm/prims/jvmtiTagMap.cpp |  8 +++++++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diffs (29 lines):

diff -r 569fa196e6d0 -r 436b85007718 .hgtags
--- a/.hgtags	Wed Feb 04 16:53:14 2015 +0000
+++ b/.hgtags	Thu Feb 05 16:11:14 2015 +0000
@@ -833,3 +833,4 @@
 a89267b51c40cba0b26fe84831478389723c8321 jdk7u80-b04
 00402b4ff7a90a6deba09816192e335cadfdb4f0 jdk7u80-b05
 1792bfb4a54d87ff87438413a34004a6b6004987 icedtea-2.6pre18
+8f3c9cf0636f4d40e9c3647e03c7d0ca6d1019ee icedtea-2.6pre19
diff -r 569fa196e6d0 -r 436b85007718 src/share/vm/prims/jvmtiTagMap.cpp
--- a/src/share/vm/prims/jvmtiTagMap.cpp	Wed Feb 04 16:53:14 2015 +0000
+++ b/src/share/vm/prims/jvmtiTagMap.cpp	Thu Feb 05 16:11:14 2015 +0000
@@ -1069,10 +1069,16 @@
 {
   assert(str->klass() == SystemDictionary::String_klass(), "not a string");
 
+  typeArrayOop s_value = java_lang_String::value(str);
+
+  // JDK-6584008: the value field may be null if a String instance is
+  // partially constructed.
+  if (s_value == NULL) {
+    return 0;
+  }
   // get the string value and length
   // (string value may be offset from the base)
   int s_len = java_lang_String::length(str);
-  typeArrayOop s_value = java_lang_String::value(str);
   int s_offset = java_lang_String::offset(str);
   jchar* value;
   if (s_len > 0) {