Mercurial > hg > truffle

diff src/share/vm/classfile/javaClasses.cpp @ 974:26b774d693aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author acorn
date Wed, 16 Sep 2009 09:10:57 -0400
parents 489a4f8dcd0f
children 389049f3f393 6aa7255741f3
line wrap: on
line diff
--- a/src/share/vm/classfile/javaClasses.cpp	Fri Sep 04 12:53:02 2009 -0400
+++ b/src/share/vm/classfile/javaClasses.cpp	Wed Sep 16 09:10:57 2009 -0400
@@ -252,7 +252,7 @@
   typeArrayOop value  = java_lang_String::value(obj);
   int          offset = java_lang_String::offset(obj);
   int          length = java_lang_String::length(obj);
-  jchar* base = value->char_at_addr(offset);
+  jchar* base = (length == 0) ? NULL : value->char_at_addr(offset);
   symbolOop sym = SymbolTable::lookup_unicode(base, length, THREAD);
   return symbolHandle(THREAD, sym);
 }
@@ -261,7 +261,7 @@
   typeArrayOop value  = java_lang_String::value(java_string);
   int          offset = java_lang_String::offset(java_string);
   int          length = java_lang_String::length(java_string);
-  jchar* base = value->char_at_addr(offset);
+  jchar* base = (length == 0) ? NULL : value->char_at_addr(offset);
   return SymbolTable::probe_unicode(base, length);
 }