Fix issue 13942 - Dart_Error function invokes OS::VSNPrint with the "format" string containing data…

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 158 matching lines @@
   return (strcmp(url_name, kBuiltinLibURL) == 0);
 }
 
 
 Dart_Handle DartUtils::CanonicalizeURL(CommandLineOptions* url_mapping,
                                        Dart_Handle library,
                                        const char* url_str) {
   // Get the url of the including library.
   Dart_Handle library_url = Dart_LibraryUrl(library);
   if (Dart_IsError(library_url)) {
-    return Dart_Error("accessing library url failed");
+    return Dart_NewApiError("accessing library url failed");
   }
   if (!Dart_IsString(library_url)) {
-    return Dart_Error("library url is not a string");
+    return Dart_NewApiError("library url is not a string");
   }
   const char* library_url_str = NULL;
   Dart_Handle result = Dart_StringToCString(library_url, &library_url_str);
   if (Dart_IsError(result)) {
-    return Dart_Error("accessing library url characters failed");
+    return Dart_NewApiError("accessing library url characters failed");
   }
   if (url_mapping != NULL) {
     const char* mapped_library_url_str = MapLibraryUrl(url_mapping,
                                                        library_url_str);
     if (mapped_library_url_str != NULL) {
       library_url_str = mapped_library_url_str;
     }
   }
   // Calculate the canonical path.
   const char* canon_url_str = GetCanonicalPath(library_url_str, url_str);
@@ skipping 87 matching lines @@
     // Return error.
     Dart_Handle responseStatus =
         Dart_Invoke(builtin_lib,
                     DartUtils::NewString("_getHttpRequestStatusString"),
                     0,
                     NULL);
     if (Dart_IsError(responseStatus)) {
       return responseStatus;
     }
     if (Dart_IsNull(responseStatus)) {
-      return Dart_Error("HTTP error.");
+      return Dart_NewApiError("HTTP error.");
     }
-    return Dart_Error(DartUtils::GetStringValue(responseStatus));
+    return Dart_NewApiError(DartUtils::GetStringValue(responseStatus));
   }
   Dart_Handle response =
       Dart_Invoke(builtin_lib, DartUtils::NewString("_getHttpRequestResponse"),
                   0, NULL);
   if (Dart_IsError(response)) {
     return response;
   }
   if (Dart_IsString(response)) {
     // Received response as string.
     uint8_t* responseString = NULL;
@@ skipping 71 matching lines @@
   DartUtils::CloseFile(stream);
   return text_buffer;
 }
 
 
 Dart_Handle DartUtils::ReadStringFromFile(const char* filename) {
   const char* error_msg = NULL;
   intptr_t len;
   const uint8_t* text_buffer = ReadFileFully(filename, &len, &error_msg);
   if (text_buffer == NULL) {
-    return Dart_Error(error_msg);
+    return Dart_NewApiError(error_msg);
   }
   Dart_Handle str = Dart_NewStringFromUTF8(text_buffer, len);
   free(const_cast<uint8_t *>(text_buffer));
   return str;
 }
 
 
 Dart_Handle DartUtils::SetWorkingDirectory(Dart_Handle builtin_lib) {
   Dart_Handle directory = NewString(original_working_directory);
   return SingleArgDart_Invoke(builtin_lib, "_setWorkingDirectory", directory);
@@ skipping 33 matching lines @@
   dart_args[1] = url;
   return Dart_Invoke(
       builtin_lib, NewString("_resolveUri"), kNumArgs, dart_args);
 }
 
 
 Dart_Handle DartUtils::LibraryTagHandler(Dart_LibraryTag tag,
                                          Dart_Handle library,
                                          Dart_Handle url) {
   if (!Dart_IsLibrary(library)) {
-    return Dart_Error("not a library");
+    return Dart_NewApiError("not a library");
   }
   if (!Dart_IsString(url)) {
-    return Dart_Error("url is not a string");
+    return Dart_NewApiError("url is not a string");
   }
   const char* url_string = NULL;
   Dart_Handle result = Dart_StringToCString(url, &url_string);
   if (Dart_IsError(result)) {
     return result;
   }
   Dart_Handle library_url = Dart_LibraryUrl(library);
   const char* library_url_string = NULL;
   result = Dart_StringToCString(library_url, &library_url_string);
   if (Dart_IsError(result)) {
@@ skipping 21 matching lines @@
     return ResolveUri(library_url, url, builtin_lib);
   }
 
   // Handle 'import' of dart scheme URIs (i.e they start with 'dart:').
   if (is_dart_scheme_url) {
     if (tag == Dart_kImportTag) {
       // Handle imports of other built-in libraries present in the SDK.
       if (DartUtils::IsDartIOLibURL(url_string)) {
         return Builtin::LoadAndCheckLibrary(Builtin::kIOLibrary);
       }
-      return Dart_Error("The built-in library '%s' is not available"
-                        " on the stand-alone VM.\n", url_string);
+      return NewError("The built-in library '%s' is not available"
+                      " on the stand-alone VM.\n", url_string);
     } else {
       ASSERT(tag == Dart_kSourceTag);
-      return Dart_Error("Unable to load source '%s' ", url_string);
+      return NewError("Unable to load source '%s' ", url_string);
     }
   }
 
   // Handle 'part' of IO library.
   if (is_io_library) {
     if (tag == Dart_kSourceTag) {
       return Dart_LoadSource(
           library, url, Builtin::PartSource(Builtin::kIOLibrary, url_string));
     } else {
       ASSERT(tag == Dart_kImportTag);
-      return Dart_Error("Unable to import '%s' ", url_string);
+      return NewError("Unable to import '%s' ", url_string);
     }
   }
 
   // Handle 'import' or 'part' requests for all other URIs.
   // Get the file path out of the url.
   Dart_Handle builtin_lib =
       Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
   Dart_Handle file_path = FilePathFromUri(url, builtin_lib);
   if (Dart_IsError(file_path)) {
     return file_path;
   }
   Dart_StringToCString(file_path, &url_string);
   if (is_dart_extension_url) {
     if (tag != Dart_kImportTag) {
-      return Dart_Error("Dart extensions must use import: '%s'", url_string);
+      return NewError("Dart extensions must use import: '%s'", url_string);
     }
     return Extensions::LoadExtension(url_string, library);
   }
   result = DartUtils::LoadSource(NULL,
                                  library,
                                  url,
                                  tag,
                                  url_string);
   return result;
 }
@@ skipping 64 matching lines @@
     return script_path;
   }
   const char* script_path_cstr;
   Dart_StringToCString(script_path, &script_path_cstr);
   const char* error_msg = NULL;
   intptr_t len;
   const uint8_t* buffer = ReadFileFully(script_path_cstr,
                                         &len,
                                         &error_msg);
   if (buffer == NULL) {
-    return Dart_Error(error_msg);
+    return Dart_NewApiError(error_msg);
   }
   bool is_snapshot = false;
   const uint8_t *payload = SniffForMagicNumber(buffer, &len, &is_snapshot);
   Dart_Handle returnValue;
   if (is_snapshot) {
     returnValue = Dart_LoadScriptFromSnapshot(payload, len);
   } else {
     Dart_Handle source = Dart_NewStringFromUTF8(buffer, len);
     if (Dart_IsError(source)) {
       returnValue = source;
     } else {
       returnValue = Dart_LoadScript(resolved_script_uri, source, 0, 0);
     }
   }
   free(const_cast<uint8_t *>(buffer));
   return returnValue;
 }
 
 
 Dart_Handle DartUtils::LoadSource(CommandLineOptions* url_mapping,
                                   Dart_Handle library,
                                   Dart_Handle url,
                                   Dart_LibraryTag tag,
                                   const char* url_string) {
   bool is_http_scheme_url = DartUtils::IsHttpSchemeURL(url_string);
   if (url_mapping != NULL && IsDartSchemeURL(url_string)) {
     const char* mapped_url_string = MapLibraryUrl(url_mapping, url_string);
     if (mapped_url_string == NULL) {
-      return Dart_Error("Do not know how to load %s", url_string);
+      return NewError("Do not know how to load %s", url_string);
     }
     // We have a URL mapping specified, just read the file that the
     // URL mapping specifies and load it.
     url_string = mapped_url_string;
   }
   Dart_Handle source;
   if (is_http_scheme_url) {
     // Read the file over http.
     source = DartUtils::ReadStringFromHttp(url_string);
   } else {
     // Read the file.
     source = DartUtils::ReadStringFromFile(url_string);
   }
   if (Dart_IsError(source)) {
     return source;  // source contains the error string.
   }
   // The tag is either an import or a source tag.
   // Load it according to the specified tag.
   if (tag == Dart_kImportTag) {
     // Return library object or an error string.
     return Dart_LoadLibrary(url, source);
   } else if (tag == Dart_kSourceTag) {
     return Dart_LoadSource(library, url, source);
   }
-  return Dart_Error("wrong tag");
+  return Dart_NewApiError("wrong tag");
 }
 
 
 Dart_Handle DartUtils::PrepareForScriptLoading(const char* package_root,
                                                Dart_Handle builtin_lib) {
   // Setup the internal library's 'internalPrint' function.
   Dart_Handle internal_lib =
       Dart_LookupLibrary(NewString("dart:_collection-dev"));
   DART_CHECK_VALID(internal_lib);
   Dart_Handle print = Dart_Invoke(
@@ skipping 178 matching lines @@
                                           const char* message,
                                           Dart_Handle os_error) {
   // Create a dart:io exception object of the given type.
   return NewDartExceptionWithOSError(kIOLibURL,
                                      exception_name,
                                      message,
                                      os_error);
 }
 
 
+Dart_Handle DartUtils::NewError(const char* format, ...) {
+  va_list args;
+  va_start(args, format);
+  intptr_t len = vsnprintf(NULL, 0, format, args);
+  va_end(args);
+
+  char* buffer = reinterpret_cast<char*>(Dart_ScopeAllocate(len + 1));
+  va_list args2;
+  va_start(args2, format);
+  vsnprintf(buffer, (len + 1), format, args2);
+  va_end(args2);
+
+  return Dart_NewApiError(buffer);
+}
+
+
 Dart_Handle DartUtils::NewInternalError(const char* message) {
   return NewDartExceptionWithMessage(kCoreLibURL, "_InternalError", message);
 }
 
 
 bool DartUtils::SetOriginalWorkingDirectory() {
   original_working_directory = Directory::Current();
   return original_working_directory != NULL;
 }
 
@@ skipping 160 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