- The callback_error_ handle was never being setup.

runtime/vm/dart_api_state.h

 // Copyright (c) 2012, 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.
 
 #ifndef VM_DART_API_STATE_H_
 #define VM_DART_API_STATE_H_
 
 #include "include/dart_api.h"
 
 #include "platform/thread.h"
@@ skipping 509 matching lines @@
 };
 
 
 // Implementation of the API State used in dart api for maintaining
 // local scopes, persistent handles etc. These are setup on a per isolate
 // basis and destroyed when the isolate is shutdown.
 class ApiState {
  public:
   ApiState() : top_scope_(NULL), delayed_weak_reference_sets_(NULL),
                null_(NULL), true_(NULL), false_(NULL),
-               callback_error_(NULL) {}
+               acquired_error_(NULL) {}
   ~ApiState() {
     while (top_scope_ != NULL) {
       ApiLocalScope* scope = top_scope_;
       top_scope_ = top_scope_->previous();
       delete scope;
     }
     if (null_ != NULL) {
       persistent_handles().FreeHandle(null_);
       null_ = NULL;
     }
     if (true_ != NULL) {
       persistent_handles().FreeHandle(true_);
       true_ = NULL;
     }
     if (false_ != NULL) {
       persistent_handles().FreeHandle(false_);
       false_ = NULL;
     }
+    if (acquired_error_ != NULL) {
+      persistent_handles().FreeHandle(acquired_error_);
+      acquired_error_ = NULL;
+    }
   }
 
   // Accessors.
   ApiLocalScope* top_scope() const { return top_scope_; }
   void set_top_scope(ApiLocalScope* value) { top_scope_ = value; }
 
   PersistentHandles& persistent_handles() { return persistent_handles_; }
 
   FinalizablePersistentHandles& weak_persistent_handles() {
     return weak_persistent_handles_;
@@ skipping 85 matching lines @@
     int total = 0;
     ApiLocalScope* scope = top_scope_;
     while (scope != NULL) {
       total += scope->zone()->SizeInBytes();
       scope = scope->previous();
     }
     return total;
   }
   PersistentHandle* Null() {
     if (null_ == NULL) {
-      DARTSCOPE(Isolate::Current());
-
-      Object& null_object = Object::Handle();
       null_ = persistent_handles().AllocateHandle();
-      null_->set_raw(null_object);
+      null_->set_raw(Object::null());
     }
     return null_;
   }
   PersistentHandle* True() {
     if (true_ == NULL) {
-      DARTSCOPE(Isolate::Current());
-
       true_ = persistent_handles().AllocateHandle();
       true_->set_raw(Bool::True());
     }
     return true_;
   }
   PersistentHandle* False() {
     if (false_ == NULL) {
-      DARTSCOPE(Isolate::Current());
-
       false_ = persistent_handles().AllocateHandle();
       false_->set_raw(Bool::False());
     }
     return false_;
   }
 
-  void SetupCallbackError() {
-    ASSERT(callback_error_ == NULL);
-    callback_error_ = persistent_handles().AllocateHandle();
-    callback_error_->set_raw(
+  void SetupAcquiredError() {
+    ASSERT(acquired_error_ == NULL);
+    acquired_error_ = persistent_handles().AllocateHandle();
+    acquired_error_->set_raw(
         String::New("Internal Dart data pointers have been acquired, "
-                    "please release them using Dart_ByteArrayReleaseData."));
+                    "please release them using Dart_TypedDataReleaseData."));
   }
 
-  PersistentHandle* CallbackError() const {
-    ASSERT(callback_error_ != NULL);
-    return callback_error_;
+  PersistentHandle* AcquiredError() const {
+    ASSERT(acquired_error_ != NULL);
+    return acquired_error_;
   }
 
   void DelayWeakReferenceSet(WeakReferenceSet* reference_set) {
     WeakReferenceSet::Push(reference_set, &delayed_weak_reference_sets_);
   }
 
  private:
   PersistentHandles persistent_handles_;
   FinalizablePersistentHandles weak_persistent_handles_;
   FinalizablePersistentHandles prologue_weak_persistent_handles_;
   ApiLocalScope* top_scope_;
   WeakReferenceSet* delayed_weak_reference_sets_;
 
   // Persistent handles to important objects.
   PersistentHandle* null_;
   PersistentHandle* true_;
   PersistentHandle* false_;
-  PersistentHandle* callback_error_;
+  PersistentHandle* acquired_error_;
 
   DISALLOW_COPY_AND_ASSIGN(ApiState);
 };
 
 
 class ApiNativeScope {
  public:
   ApiNativeScope() {
     // Currently no support for nesting native scopes.
     ASSERT(Current() == NULL);
@@ skipping 31 matching lines @@
           ApiNativeScope::Current()->zone()) {}
   ApiGrowableArray()
       : BaseGrowableArray<T, ValueObject>(
           ApiNativeScope::Current()->zone()) {}
 };
 
 
 }  // namespace dart
 
 #endif  // VM_DART_API_STATE_H_