# HG changeset patch
# User minqi
# Date 1368214212 0
# Node ID 1fcfc045b229aabcb67c4cf94e5ef990706738ba
# Parent  92ef81e2f5710a54aac107127062c35c7dfabdd9# Parent  0b7f780697326975d2a90ce5c4fbc34d0db9f4ab
Merge

diff -r 92ef81e2f571 -r 1fcfc045b229 src/share/vm/prims/jvmtiExport.cpp
--- a/src/share/vm/prims/jvmtiExport.cpp	Fri May 10 08:27:30 2013 -0700
+++ b/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;
       }