Post landing fixes

runtime/vm/profiler.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include <cstdio>
 
 #include "platform/utils.h"
 
 #include "vm/isolate.h"
 #include "vm/json_stream.h"
@@ skipping 183 matching lines @@
   ASSERT(new_capacity < kMaxProfiledIsolates);
   ASSERT(new_capacity > isolates_capacity_);
   Isolate* isolate = NULL;
   isolates_ = reinterpret_cast<Isolate**>(
       realloc(isolates_, sizeof(isolate) * new_capacity));
   isolates_capacity_ = new_capacity;
 }
 
 
 void ProfilerManager::AddIsolate(Isolate* isolate) {
+  if (isolates_ == NULL) {
+    // We are shutting down.
+    return;
+  }
   // Must be called with monitor_ locked.
   if (isolates_size_ == isolates_capacity_) {
     ResizeIsolates(isolates_capacity_ == 0 ? 16 : isolates_capacity_ * 2);
   }
   isolates_[isolates_size_] = isolate;
   isolates_size_++;
 }
 
 
 intptr_t ProfilerManager::FindIsolate(Isolate* isolate) {
@@ skipping 345 matching lines @@
     return false;
   }
   uintptr_t cursor = reinterpret_cast<uintptr_t>(fp);
   cursor += sizeof(fp);
   bool r = cursor >= stack_lower_ && cursor <= stack_upper_;
   return r;
 }
 
 
 }  // namespace dart