Mercurial > hg > truffle
diff src/share/vm/runtime/sharedRuntime.cpp @ 62:cd0742ba123c
Merge
author | kamg |
---|---|
date | Thu, 20 Mar 2008 09:17:30 -0500 |
parents | 67914967a4b5 9785f6d2dd97 |
children | 018d5b58dd4f b130b98db9cf |
line wrap: on
line diff
--- a/src/share/vm/runtime/sharedRuntime.cpp Thu Mar 13 14:17:48 2008 -0700 +++ b/src/share/vm/runtime/sharedRuntime.cpp Thu Mar 20 09:17:30 2008 -0500 @@ -1486,11 +1486,9 @@ const char* desc = " cannot be cast to "; size_t msglen = strlen(objName) + strlen(desc) + strlen(targetKlassName) + 1; - char* message = NEW_C_HEAP_ARRAY(char, msglen); + char* message = NEW_RESOURCE_ARRAY(char, msglen); if (NULL == message) { - // out of memory - can't use a detailed message. Since caller is - // using a resource mark to free memory, returning this should be - // safe (caller won't explicitly delete it). + // Shouldn't happen, but don't cause even more problems if it does message = const_cast<char*>(objName); } else { jio_snprintf(message, msglen, "%s%s%s", objName, desc, targetKlassName);