dart:io | Fix error in deserializing of native port messages.

runtime/vm/dart_api_message.cc

 // 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.
 
 #include "vm/dart_api_message.h"
 #include "vm/object.h"
 #include "vm/snapshot_ids.h"
 #include "vm/symbols.h"
 #include "vm/unicode.h"
 
@@ skipping 249 matching lines @@
   }
   if (SerializedHeaderTag::decode(value) == kObjectId) {
     return ReadIndexedObject(SerializedHeaderData::decode(value));
   }
   ASSERT(SerializedHeaderTag::decode(value) == kInlined);
   // Read the class header information and lookup the class.
   intptr_t class_header = ReadIntptrValue();
 
   // Reading of regular dart instances is not supported.
   if (SerializedHeaderData::decode(class_header) == kInstanceObjectId) {
-    return AllocateDartCObjectUnsupported();
+    intptr_t object_id = SerializedHeaderData::decode(value);
+    Dart_CObject* object = AllocateDartCObjectUnsupported();
+    AddBackRef(object_id, object, kIsNotDeserialized);
+    return object;
   }
   ASSERT((class_header & kSmiTagMask) != 0);
   intptr_t object_id = SerializedHeaderData::decode(value);
   intptr_t class_id = LookupInternalClass(class_header);
   if ((class_id == kArrayCid) || (class_id == kImmutableArrayCid)) {
     ASSERT(GetBackRef(object_id) == NULL);
     intptr_t len = ReadSmiValue();
     Dart_CObject* value = AllocateDartCObjectArray(len);
     AddBackRef(object_id, value, kIsNotDeserialized);
     return value;
@@ skipping 22 matching lines @@
   }
   // No other VM isolate objects are supported.
   return AllocateDartCObjectNull();
 }
 
 
 Dart_CObject* ApiMessageReader::ReadInternalVMObject(intptr_t class_id,
                                                      intptr_t object_id) {
   switch (class_id) {
     case kClassCid: {
-      return AllocateDartCObjectUnsupported();
+      Dart_CObject* object = AllocateDartCObjectUnsupported();
+      AddBackRef(object_id, object, kIsDeserialized);
+      return object;
     }
     case kTypeArgumentsCid: {
       // TODO(sjesse): Remove this when message serialization format is
       // updated (currently length is leaked).
       Dart_CObject* value = &type_arguments_marker;
       AddBackRef(object_id, value, kIsDeserialized);
       Dart_CObject* length = ReadObjectImpl();
       ASSERT(length->type == Dart_CObject::kInt32);
       for (int i = 0; i < length->value.as_int32; i++) {
         Dart_CObject* type = ReadObjectImpl();
@@ skipping 136 matching lines @@
       // Read the content of the GrowableObjectArray.
       Dart_CObject* content = ReadObjectImpl();
       ASSERT(content->type == Dart_CObject::kArray);
       // Make the empty array allocated point to the backing store content.
       value->value.as_array.length = len;
       value->value.as_array.values = content->value.as_array.values;
       return value;
     }
     default:
       // Everything else not supported.
-      return AllocateDartCObjectUnsupported();
+      Dart_CObject* value = AllocateDartCObjectUnsupported();
+      AddBackRef(object_id, value, kIsDeserialized);
+      return value;
   }
 }
 
 
 Dart_CObject* ApiMessageReader::ReadIndexedObject(intptr_t object_id) {
   if (object_id == kDynamicType ||
       object_id == kDoubleType ||
       object_id == kIntType ||
       object_id == kBoolType ||
       object_id == kStringType) {
@@ skipping 422 matching lines @@
     if (!success) {
       UnmarkAllCObjects(object);
       return false;
     }
   }
   UnmarkAllCObjects(object);
   return true;
 }
 
 }  // namespace dart