- Check for error when creating the source string.

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 "bin/extensions.h"
 #include "bin/directory.h"
 #include "bin/file.h"
 #include "bin/io_buffer.h"
@@ skipping 373 matching lines @@
   const uint8_t* text_buffer = ReadFile(script_path_cstr, &len, &error_msg);
   if (text_buffer == NULL) {
     return Dart_Error(error_msg);
   }
   bool is_snapshot = false;
   text_buffer = SniffForMagicNumber(text_buffer, &len, &is_snapshot);
   if (is_snapshot) {
     return Dart_LoadScriptFromSnapshot(text_buffer, len);
   } else {
     Dart_Handle source = Dart_NewStringFromUTF8(text_buffer, len);
+    if (Dart_IsError(source)) {
+      return source;
+    }
     return Dart_LoadScript(resolved_script_uri, source, 0, 0);

[Mads Ager (google), 2013/04/22 13:05:41]

I thought all of the APIs had the property that they return an error is one of
the arguments is an error. I believe that is the case with most of the other
APIs, should we make that the case for LoadScript as well?

[Ivan Posva, 2013/04/22 13:12:42]

Dart_LoadScript does return an error if it gets unexpected parameters, but at
that point the more descriptive error you would get from Dart_NewStringFromUTF8
is discarded.

[Mads Ager (google), 2013/04/22 13:13:48]

I see. Thanks! :)

   }
 }
 
 
 Dart_Handle DartUtils::LoadSource(CommandLineOptions* url_mapping,
                                   Dart_Handle library,
                                   Dart_Handle url,
                                   Dart_LibraryTag tag,
                                   const char* url_string) {
   if (url_mapping != NULL && IsDartSchemeURL(url_string)) {
@@ skipping 334 matching lines @@
 
 CObject* CObject::NewOSError(OSError* os_error) {
   CObject* error_message =
       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;
 }