Mercurial > hg > truffle
diff src/share/vm/classfile/javaClasses.cpp @ 11015:7ee0d5c53c78
Merge
author | chegar |
---|---|
date | Wed, 08 May 2013 15:25:08 +0100 |
parents | 4b52137b07c9 f258c5828eb8 |
children | eaf3742822ec |
line wrap: on
line diff
--- a/src/share/vm/classfile/javaClasses.cpp Wed May 01 14:11:01 2013 +0100 +++ b/src/share/vm/classfile/javaClasses.cpp Wed May 08 15:25:08 2013 +0100 @@ -315,14 +315,18 @@ return string; } -jchar* java_lang_String::as_unicode_string(oop java_string, int& length) { +jchar* java_lang_String::as_unicode_string(oop java_string, int& length, TRAPS) { typeArrayOop value = java_lang_String::value(java_string); int offset = java_lang_String::offset(java_string); length = java_lang_String::length(java_string); - jchar* result = NEW_RESOURCE_ARRAY(jchar, length); - for (int index = 0; index < length; index++) { - result[index] = value->char_at(index + offset); + jchar* result = NEW_RESOURCE_ARRAY_RETURN_NULL(jchar, length); + if (result != NULL) { + for (int index = 0; index < length; index++) { + result[index] = value->char_at(index + offset); + } + } else { + THROW_MSG_0(vmSymbols::java_lang_OutOfMemoryError(), "could not allocate Unicode string"); } return result; }