*** old/src/share/vm/services/mallocTracker.cpp	Wed Sep 24 18:18:44 2014
--- new/src/share/vm/services/mallocTracker.cpp	Wed Sep 24 18:18:43 2014

*** 138,165 ****
--- 138,162 ----
  
    if (malloc_base == NULL) {
      return NULL;
    }
  
    // Check malloc size, size has to <= MAX_MALLOC_SIZE. This is only possible on 32-bit
    // systems, when malloc size >= 1GB, but is is safe to assume it won't happen.
    if (size > MAX_MALLOC_SIZE) {
      fatal("Should not use malloc for big memory block, use virtual memory instead");
    }
    // Uses placement global new operator to initialize malloc header
    switch(level) {
      case NMT_off:
        return malloc_base;
      case NMT_minimal: {
        MallocHeader* hdr = ::new (malloc_base) MallocHeader();
        break;
      }
      case NMT_summary: {
+       assert(size <= MAX_MALLOC_SIZE, "malloc size overrun for NMT");
        header = ::new (malloc_base) MallocHeader(size, flags);
        break;
      }
      case NMT_detail: {
+       assert(size <= MAX_MALLOC_SIZE, "malloc size overrun for NMT");
        header = ::new (malloc_base) MallocHeader(size, flags, stack);
        break;
      }
      default:
        ShouldNotReachHere();