Merge
authorminqi
Fri, 10 May 2013 19:30:12 +0000
changeset 17371 5b472486efd7
parent 17370 59a0620561fa (current diff)
parent 17368 b7cb1739172e (diff)
child 17372 a8018a1c33e0
Merge
--- a/hotspot/src/share/vm/prims/jvmtiExport.cpp	Fri May 10 08:27:30 2013 -0700
+++ b/hotspot/src/share/vm/prims/jvmtiExport.cpp	Fri May 10 19:30:12 2013 +0000
@@ -619,6 +619,9 @@
         // data has been changed by the new retransformable agent
         // and it hasn't already been cached, cache it
         *_cached_data_ptr = (unsigned char *)os::malloc(_curr_len, mtInternal);
+        if (*_cached_data_ptr == NULL) {
+          vm_exit_out_of_memory(_curr_len, OOM_MALLOC_ERROR, "unable to allocate cached copy of original class bytes");
+        }
         memcpy(*_cached_data_ptr, _curr_data, _curr_len);
         *_cached_length_ptr = _curr_len;
       }