Add missing backref collection when reading mint and bigint objects in a native message handler

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/object_store.h"
 
 namespace dart {
 
@@ skipping 172 matching lines @@
       // TODO(sjesse): Remove this when message serialization format is
       // updated (currently length is leaked).
       AddBackwardReference(object_id, NULL);
       Dart_CObject* length = ReadObject();
       ASSERT(length->type == Dart_CObject::kInt32);
       for (int i = 0; i < length->value.as_int32; i++) {
         Dart_CObject* type = ReadObject();
         if (type != &dynamic_type_marker) return NULL;
       }
       return &type_arguments_marker;
-      break;
     }
     case ObjectStore::kArrayClass: {
       intptr_t len = ReadSmiValue();
       Dart_CObject* value = AllocateDartCObjectArray(len);
       AddBackwardReference(object_id, value);
       // Skip type arguments.
       // TODO(sjesse): Remove this when message serialization format is
       // updated (currently type_arguments is leaked).
       Dart_CObject* type_arguments = ReadObject();
       if (type_arguments != &type_arguments_marker &&
           type_arguments->type != Dart_CObject::kNull) {
         return NULL;
       }
       for (int i = 0; i < len; i++) {
         value->value.as_array.values[i] = ReadObject();
       }
       return value;
-      break;
     }
     case ObjectStore::kMintClass: {
       int64_t value = Read<int64_t>();
+      Dart_CObject* object;
       if (kMinInt32 <= value && value <= kMaxInt32) {
-        return AllocateDartCObjectInt32(value);
+        object = AllocateDartCObjectInt32(value);
       } else {
-        return AllocateDartCObjectInt64(value);
+        object = AllocateDartCObjectInt64(value);
       }
-      break;
+      AddBackwardReference(object_id, object);
+      return object;
     }
     case ObjectStore::kBigintClass: {
       // Read in the hex string representation of the bigint.
       intptr_t len = ReadIntptrValue();
       Dart_CObject* object = AllocateDartCObjectBigint(len);
+      AddBackwardReference(object_id, object);
       char* p = object->value.as_bigint;
       for (intptr_t i = 0; i < len; i++) {
         p[i] = Read<uint8_t>();
       }
       p[len] = '\0';
       return object;
-      break;
     }
     case ObjectStore::kDoubleClass: {
       // Read the double value for the object.
       Dart_CObject* object = AllocateDartCObjectDouble(Read<double>());
       AddBackwardReference(object_id, object);
       return object;
-      break;
     }
     case ObjectStore::kOneByteStringClass: {
       intptr_t len = ReadSmiValue();
       intptr_t hash = ReadSmiValue();
       USE(hash);
       Dart_CObject* object = AllocateDartCObjectString(len);
       AddBackwardReference(object_id, object);
       char* p = object->value.as_string;
       for (intptr_t i = 0; i < len; i++) {
         p[i] = Read<uint8_t>();
       }
       p[len] = '\0';
       return object;
-      break;
     }
     case ObjectStore::kTwoByteStringClass:
       // Two byte strings not supported.
       return NULL;
-      break;
     case ObjectStore::kFourByteStringClass:
       // Four byte strings not supported.
       return NULL;
-      break;
     case ObjectStore::kInternalByteArrayClass: {
       intptr_t len = ReadSmiValue();
       Dart_CObject* object = AllocateDartCObjectByteArray(len);
       AddBackwardReference(object_id, object);
       if (len > 0) {
         uint8_t* p = object->value.as_byte_array.values;
         for (intptr_t i = 0; i < len; i++) {
           p[i] = Read<uint8_t>();
         }
       }
       return object;
-      break;
     }
     default:
       // Everything else not supported.
       return NULL;
   }
 }
 
 
 Dart_CObject* ApiMessageReader::ReadIndexedObject(intptr_t object_id) {
   if (object_id == Object::kNullObject) {
@@ skipping 42 matching lines @@
   return ReadObjectImpl(value);
 }
 
 
 void ApiMessageReader::AddBackwardReference(intptr_t id, Dart_CObject* obj) {
   ASSERT((id - kMaxPredefinedObjectIds) == backward_references_.length());
   backward_references_.Add(obj);
 }
 
 }  // namespace dart