Mercurial > hg > release > icedtea7-forest-2.5 > hotspot

changeset 5822:0b1e07df4b1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6584008, PR2193, RH1173326: jvmtiStringPrimitiveCallback should not be invoked when string value is null Reviewed-by: sla, sspitsyn
author aph
date Fri, 16 Jan 2015 09:15:22 +0100
parents bbda609c9d24
children 37d0575cf6de
files src/share/vm/prims/jvmtiTagMap.cpp
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiTagMap.cpp	Tue Jan 27 00:46:17 2015 +0000
+++ b/src/share/vm/prims/jvmtiTagMap.cpp	Fri Jan 16 09:15:22 2015 +0100
@@ -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) {