Fixed memory leaks in runtime/bin/dartutils.cc

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 371 matching lines @@
 
 
 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);
   }
   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 185 matching lines @@
   }
   Dart_Handle script_path = DartUtils::FilePathFromUri(resolved_script_uri,
                                                        builtin_lib);
   if (Dart_IsError(script_path)) {
     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* text_buffer = ReadFileFully(script_path_cstr,
-                                             &len,
-                                             &error_msg);
-  if (text_buffer == NULL) {
+  const uint8_t* buffer = ReadFileFully(script_path_cstr,
+                                        &len,
+                                        &error_msg);
+  if (buffer == NULL) {
     return Dart_Error(error_msg);
   }
   bool is_snapshot = false;
-  text_buffer = SniffForMagicNumber(text_buffer, &len, &is_snapshot);
+  const uint8_t *payload = SniffForMagicNumber(buffer, &len, &is_snapshot);
+  Dart_Handle returnValue;
   if (is_snapshot) {
-    return Dart_LoadScriptFromSnapshot(text_buffer, len);
+    returnValue = Dart_LoadScriptFromSnapshot(payload, len);
   } else {
-    Dart_Handle source = Dart_NewStringFromUTF8(text_buffer, len);
+    Dart_Handle source = Dart_NewStringFromUTF8(buffer, len);
     if (Dart_IsError(source)) {
-      return source;
+      returnValue = source;
+    } else {
+      returnValue = Dart_LoadScript(resolved_script_uri, source, 0, 0);
     }
-    return 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)) {
@@ skipping 374 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