Mercurial > hg > graal-compiler

diff src/share/vm/runtime/os.cpp @ 6985:80e866b1d053

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author coleenp
date Fri, 16 Nov 2012 09:19:12 -0500
parents 6cb0d32b828b e4f764ddb06a
children 2cb439954abf f34d701e952e
line wrap: on
line diff
--- a/src/share/vm/runtime/os.cpp	Fri Nov 16 09:59:08 2012 +0100
+++ b/src/share/vm/runtime/os.cpp	Fri Nov 16 09:19:12 2012 -0500
@@ -582,7 +582,9 @@
     // if NULL is returned the calling functions assume out of memory.
     size = 1;
   }
-
+  if (size > size + space_before + space_after) { // Check for rollover.
+    return NULL;
+  }
   NOT_PRODUCT(if (MallocVerifyInterval > 0) check_heap());
   u_char* ptr = (u_char*)::malloc(size + space_before + space_after);