Merged third_party/tcmalloc/vendor/src(google-perftools r87) into...

third_party/tcmalloc/chromium/src/windows/preamble_patcher.cc

 /* Copyright (c) 2007, Google Inc.
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 298 matching lines @@
   }
 
   // Replace the first few bytes of the original function with the bytes we
   // previously moved to the preamble stub.
   memcpy(reinterpret_cast<void*>(target),
          original_function_stub, preamble_bytes);
 
   // Stub is now useless so delete it.
   // [csilvers: Commented out for perftools because it causes big problems
   //  when we're unpatching malloc.  We just let this live on as a  leak.]
-  //delete original_function_stub;
+  //delete [] reinterpret_cast<unsigned char*>(original_function_stub);
 
   // Restore the protection of the first MAX_PREAMBLE_STUB_SIZE bytes of
   // target to what they were before we started goofing around.
   succeeded = ::VirtualProtect(reinterpret_cast<void*>(target),
                                MAX_PREAMBLE_STUB_SIZE,
                                old_target_function_protect,
                                &old_target_function_protect);
 
   // Flush the instruction cache to make sure the processor doesn't execute the
   // old version of the instructions (before our patch).
   //
   // See comment on FlushInstructionCache elsewhere in this file.
   succeeded = ::FlushInstructionCache(::GetCurrentProcess(),
                                       target,
                                       MAX_PREAMBLE_STUB_SIZE);
   if (!succeeded) {
     SIDESTEP_ASSERT(false && "Failed to flush instruction cache.");
     return SIDESTEP_UNEXPECTED;
   }
 
   SIDESTEP_LOG("PreamblePatcher::Unpatch successfully unpatched.");
   return SIDESTEP_SUCCESS;
 }
 
 };  // namespace sidestep