Propagate errors from DartUtils helper functions

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 47 matching lines @@
       if (strlen(url_mapped_name) != 0) {
         return url_mapped_name;  // Found a mapping for this URL.
       }
     }
   }
   return NULL;  // Did not find a mapping for this URL.
 }
 
 
 int64_t DartUtils::GetIntegerValue(Dart_Handle value_obj) {
-  ASSERT(Dart_IsInteger(value_obj));
   int64_t value = 0;
   Dart_Handle result = Dart_IntegerToInt64(value_obj, &value);
-  ASSERT(!Dart_IsError(result));
+  if (Dart_IsError(result)) Dart_PropagateError(result);
   return value;
 }
 
 
 intptr_t DartUtils::GetIntptrValue(Dart_Handle value_obj) {
-  ASSERT(Dart_IsInteger(value_obj));
   int64_t value = 0;
   Dart_Handle result = Dart_IntegerToInt64(value_obj, &value);
-  ASSERT(!Dart_IsError(result));
+  if (Dart_IsError(result)) Dart_PropagateError(result);
+  if (value < kIntptrMin || kIntptrMax < value) {
+    Dart_PropagateError(Dart_NewApiError("Value outside intptr:t range"));
+  }
   return static_cast<intptr_t>(value);
 }
 
 
 bool DartUtils::GetInt64Value(Dart_Handle value_obj, int64_t* value) {
   bool valid = Dart_IsInteger(value_obj);
   if (valid) {
     Dart_Handle result = Dart_IntegerFitsIntoInt64(value_obj, &valid);
-    ASSERT(!Dart_IsError(result));
+    if (Dart_IsError(result)) Dart_PropagateError(result);
   }
   if (!valid) return false;
   Dart_Handle result = Dart_IntegerToInt64(value_obj, value);
-  ASSERT(!Dart_IsError(result));
+  if (Dart_IsError(result)) Dart_PropagateError(result);
   return true;
 }
 
 
 const char* DartUtils::GetStringValue(Dart_Handle str_obj) {
   const char* cstring = NULL;
   Dart_Handle result = Dart_StringToCString(str_obj, &cstring);
-  ASSERT(!Dart_IsError(result));
+  if (Dart_IsError(result)) Dart_PropagateError(result);
   return cstring;
 }
 
 
 bool DartUtils::GetBooleanValue(Dart_Handle bool_obj) {
   bool value = false;
   Dart_Handle result = Dart_BooleanValue(bool_obj, &value);
-  ASSERT(!Dart_IsError(result));
+  if (Dart_IsError(result)) Dart_PropagateError(result);
   return value;
 }
 
 
 void DartUtils::SetIntegerField(Dart_Handle handle,
                                 const char* name,
                                 intptr_t val) {
   Dart_Handle result = Dart_SetField(handle,
                                      NewString(name),
                                      Dart_NewInteger(val));
-  ASSERT(!Dart_IsError(result));
+  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));
-  ASSERT(!Dart_IsError(result));
+  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));
-  ASSERT(!Dart_IsError(result));
+  if (Dart_IsError(result)) Dart_PropagateError(result);
 }
 
 
 bool DartUtils::IsDartSchemeURL(const char* url_name) {
   static const intptr_t kDartSchemeLen = strlen(kDartScheme);
   // If the URL starts with "dart:" then it is considered as a special
   // library URL which is handled differently from other URLs.
   return (strncmp(url_name, kDartScheme, kDartSchemeLen) == 0);
 }
 
@@ skipping 900 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