- Address warnings about 64-bit to 32-bit conversions.

runtime/bin/dartutils.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 "bin/dartutils.h"
 
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
@@ skipping 109 matching lines @@
 bool DartUtils::GetBooleanValue(Dart_Handle bool_obj) {
   bool value = false;
   Dart_Handle result = Dart_BooleanValue(bool_obj, &value);
   if (Dart_IsError(result)) Dart_PropagateError(result);
   return value;
 }
 
 
 void DartUtils::SetIntegerField(Dart_Handle handle,
                                 const char* name,
-                                intptr_t val) {
+                                int64_t val) {
   Dart_Handle result = Dart_SetField(handle,
                                      NewString(name),
                                      Dart_NewInteger(val));
   if (Dart_IsError(result)) Dart_PropagateError(result);
 }
 
 
-intptr_t DartUtils::GetIntegerField(Dart_Handle handle,
-                                    const char* name) {
-  Dart_Handle result = Dart_GetField(handle, NewString(name));
-  if (Dart_IsError(result)) Dart_PropagateError(result);
-  intptr_t value = DartUtils::GetIntegerValue(result);
-  return value;
-}
-
-
 void DartUtils::SetStringField(Dart_Handle handle,
                                const char* name,
                                const char* val) {
   Dart_Handle result = Dart_SetField(handle, NewString(name), NewString(val));
   if (Dart_IsError(result)) Dart_PropagateError(result);
 }
 
 
 bool DartUtils::IsDartSchemeURL(const char* url_name) {
   static const intptr_t kDartSchemeLen = strlen(kDartScheme);
@@ skipping 60 matching lines @@
 }
 
 
 void* DartUtils::OpenFile(const char* name, bool write) {
   File* file = File::Open(name, write ? File::kWriteTruncate : File::kRead);
   return reinterpret_cast<void*>(file);
 }
 
 
 void DartUtils::ReadFile(const uint8_t** data,
-                         intptr_t* file_len,
+                         intptr_t* len,
                          void* stream) {
   ASSERT(data != NULL);
-  ASSERT(file_len != NULL);
+  ASSERT(len != NULL);
   ASSERT(stream != NULL);
   File* file_stream = reinterpret_cast<File*>(stream);
-  *file_len = file_stream->Length();
-  ASSERT(*file_len > 0);
-  uint8_t* text_buffer = reinterpret_cast<uint8_t*>(malloc(*file_len));
+  int64_t file_len = file_stream->Length();
+  if ((file_len < 0) || (file_len > kIntptrMax)) {
+    *data = NULL;
+    *len = -1;  // Indicates read was not successful.
+    return;
+  }
+  *len = static_cast<intptr_t>(file_len);
+  uint8_t* text_buffer = reinterpret_cast<uint8_t*>(malloc(*len));
   ASSERT(text_buffer != NULL);
-  if (!file_stream->ReadFully(text_buffer, *file_len)) {
+  if (!file_stream->ReadFully(text_buffer, *len)) {
     *data = NULL;
-    *file_len = -1;  // Indicates read was not successful.
+    *len = -1;  // Indicates read was not successful.
     return;
   }
   *data = text_buffer;
 }
 
 
 void DartUtils::WriteFile(const void* buffer,
                           intptr_t num_bytes,
                           void* stream) {
   ASSERT(stream != NULL);
@@ skipping 43 matching lines @@
   if (Dart_IsError(result)) {
     return result;
   }
   result = Dart_Invoke(builtin_lib,
                        DartUtils::NewString("_getHttpRequestResponseCode"),
                        0,
                        NULL);
   if (Dart_IsError(result)) {
     return result;
   }
-  intptr_t responseCode = DartUtils::GetIntegerValue(result);
+  int64_t responseCode = DartUtils::GetIntegerValue(result);
   if (responseCode != HttpResponseCodeOK) {
     // Return error.
     Dart_Handle responseStatus =
         Dart_Invoke(builtin_lib,
                     DartUtils::NewString("_getHttpRequestStatusString"),
                     0,
                     NULL);
     if (Dart_IsError(responseStatus)) {
       return responseStatus;
     }
@@ skipping 714 matching lines @@
   cobject->value.as_external_typed_data.peer = peer;
   cobject->value.as_external_typed_data.callback = callback;
   return cobject;
 }
 
 
 Dart_CObject* CObject::NewIOBuffer(int64_t length) {
   // Make sure that we do not have an integer overflow here. Actual check
   // against max elements will be done at the time of writing, as the constant
   // is not part of the public API.
-  if (length > kIntptrMax) {
+  if ((length < 0) || (length > kIntptrMax)) {
     return NULL;
   }
-  uint8_t* data = IOBuffer::Allocate(length);
+  uint8_t* data = IOBuffer::Allocate(static_cast<intptr_t>(length));
   ASSERT(data != NULL);
   return NewExternalUint8Array(
       static_cast<intptr_t>(length), data, data, IOBuffer::Finalizer);
 }
 
 
 void CObject::FreeIOBufferData(Dart_CObject* cobject) {
   ASSERT(cobject->type == Dart_CObject_kExternalTypedData);
   cobject->value.as_external_typed_data.callback(
       NULL, cobject->value.as_external_typed_data.peer);
@@ skipping 25 matching lines @@
       new CObjectString(CObject::NewString(os_error->message()));
   CObjectArray* result = new CObjectArray(CObject::NewArray(3));
   result->SetAt(0, new CObjectInt32(CObject::NewInt32(kOSError)));
   result->SetAt(1, new CObjectInt32(CObject::NewInt32(os_error->code())));
   result->SetAt(2, error_message);
   return result;
 }
 
 }  // namespace bin
 }  // namespace dart