Fixes some memory leaks in //runtime/bin

runtime/bin/process.cc

 // Copyright (c) 2013, 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/io_buffer.h"
 #include "bin/log.h"
 #include "bin/platform.h"
 #include "bin/process.h"
 #include "bin/socket.h"
@@ skipping 29 matching lines @@
       Dart_PropagateError(result);
     }
     result = DartUtils::SetStringField(
         status_handle, "_errorMessage", "Max argument list length exceeded");
     if (Dart_IsError(result)) {
       Dart_PropagateError(result);
     }
     return NULL;
   }
   *length = len;
-  char** string_args = new char*[len];
+  char** string_args;
+  string_args = reinterpret_cast<char**>(
+      Dart_ScopeAllocate(len * sizeof(*string_args)));
   for (int i = 0; i < len; i++) {
     Dart_Handle arg = Dart_ListGetAt(strings, i);
     if (Dart_IsError(arg)) {
-      delete[] string_args;
       Dart_PropagateError(arg);
     }
     if (!Dart_IsString(arg)) {
       result = DartUtils::SetIntegerField(status_handle, "_errorCode", 0);
       if (Dart_IsError(result)) {
         Dart_PropagateError(result);
       }
       result = DartUtils::SetStringField(
           status_handle, "_errorMessage", error_msg);
       if (Dart_IsError(result)) {
         Dart_PropagateError(result);
       }
-      delete[] string_args;
       return NULL;
     }
     string_args[i] = const_cast<char *>(DartUtils::GetStringValue(arg));
   }
   return string_args;
 }
 
 void FUNCTION_NAME(Process_Start)(Dart_NativeArguments args) {
   Dart_Handle process =  Dart_GetNativeArgument(args, 0);
   intptr_t process_stdin;
@@ skipping 30 matching lines @@
   if (string_args == NULL) {
     Dart_SetReturnValue(args, Dart_NewBoolean(false));
     return;
   }
   Dart_Handle working_directory_handle = Dart_GetNativeArgument(args, 3);
   // Defaults to the current working directoy.
   const char* working_directory = NULL;
   if (Dart_IsString(working_directory_handle)) {
     working_directory = DartUtils::GetStringValue(working_directory_handle);
   } else if (!Dart_IsNull(working_directory_handle)) {
-    delete[] string_args;
     result = DartUtils::SetIntegerField(status_handle, "_errorCode", 0);
     if (Dart_IsError(result)) {
       Dart_PropagateError(result);
     }
     result = DartUtils::SetStringField(
         status_handle, "_errorMessage",
         "WorkingDirectory must be a builtin string");
     if (Dart_IsError(result)) {
       Dart_PropagateError(result);
     }
     Dart_SetReturnValue(args, Dart_NewBoolean(false));
     return;
   }
   Dart_Handle environment = Dart_GetNativeArgument(args, 4);
   intptr_t environment_length = 0;
   char** string_environment = NULL;
   if (!Dart_IsNull(environment)) {
     string_environment =
         ExtractCStringList(environment,
                            status_handle,
                            "Environment values must be builtin strings",
                            &environment_length);
     if (string_environment == NULL) {
-      delete[] string_args;
       Dart_SetReturnValue(args, Dart_NewBoolean(false));
       return;
     }
   }
   int64_t mode =
       DartUtils::GetInt64ValueCheckRange(Dart_GetNativeArgument(args, 5), 0, 2);
   Dart_Handle stdin_handle = Dart_GetNativeArgument(args, 6);
   Dart_Handle stdout_handle = Dart_GetNativeArgument(args, 7);
   Dart_Handle stderr_handle = Dart_GetNativeArgument(args, 8);
   Dart_Handle exit_handle = Dart_GetNativeArgument(args, 9);
   intptr_t pid = -1;
-  char* os_error_message = NULL;
+  char* os_error_message = NULL;  // Scope allocated by Process::Start.
 
   int error_code = Process::Start(path,
                                   string_args,
                                   args_length,
                                   working_directory,
                                   string_environment,
                                   environment_length,
                                   static_cast<ProcessStartMode>(mode),
                                   &process_stdout,
                                   &process_stdin,
@@ skipping 16 matching lines @@
         status_handle, "_errorCode", error_code);
     if (Dart_IsError(result)) {
       Dart_PropagateError(result);
     }
     result = DartUtils::SetStringField(
         status_handle,
         "_errorMessage",
         os_error_message != NULL ? os_error_message
                                  : "Cannot get error message");
     if (Dart_IsError(result)) {
-      delete[] string_args;
-      delete[] string_environment;
-      free(os_error_message);
       Dart_PropagateError(result);
     }
   }
-  delete[] string_args;
-  delete[] string_environment;
-  free(os_error_message);
   Dart_SetReturnValue(args, Dart_NewBoolean(error_code == 0));
 }
 
 
 void FUNCTION_NAME(Process_Wait)(Dart_NativeArguments args) {
   Dart_Handle process =  Dart_GetNativeArgument(args, 0);
   intptr_t process_stdin =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 1));
   intptr_t process_stdout =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 2));
   intptr_t process_stderr =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 3));
   intptr_t exit_event =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 4));
   ProcessResult result;
   intptr_t pid;
   Process::GetProcessIdNativeField(process, &pid);
   if (Process::Wait(pid,
                     process_stdin,
                     process_stdout,
                     process_stderr,
                     exit_event,
                     &result)) {
     Dart_Handle out = result.stdout_data();
-    if (Dart_IsError(out)) Dart_PropagateError(out);
+    if (Dart_IsError(out)) {
+      Dart_PropagateError(out);
+    }
     Dart_Handle err = result.stderr_data();
-    if (Dart_IsError(err)) Dart_PropagateError(err);
+    if (Dart_IsError(err)) {
+      Dart_PropagateError(err);
+    }
     Dart_Handle list = Dart_NewList(4);
     Dart_ListSetAt(list, 0, Dart_NewInteger(pid));
     Dart_ListSetAt(list, 1, Dart_NewInteger(result.exit_code()));
     Dart_ListSetAt(list, 2, out);
     Dart_ListSetAt(list, 3, err);
     Dart_SetReturnValue(args, list);
   } else {
     Dart_Handle error = DartUtils::NewDartOSError();
     Process::Kill(pid, 9);
     Dart_ThrowException(error);
@@ skipping 79 matching lines @@
 Dart_Handle Process::SetProcessIdNativeField(Dart_Handle process,
                                              intptr_t pid) {
   return Dart_SetNativeInstanceField(process, kProcessIdNativeField, pid);
 }
 
 
 void FUNCTION_NAME(SystemEncodingToString)(Dart_NativeArguments args) {
   Dart_Handle bytes = Dart_GetNativeArgument(args, 0);
   intptr_t bytes_length = 0;
   Dart_Handle result = Dart_ListLength(bytes, &bytes_length);
-  if (Dart_IsError(result)) Dart_PropagateError(result);
-  uint8_t* buffer =
-      reinterpret_cast<uint8_t*>(Dart_ScopeAllocate(bytes_length + 1));
+  if (Dart_IsError(result)) {
+    Dart_PropagateError(result);
+  }
+  uint8_t* buffer = Dart_ScopeAllocate(bytes_length + 1);
   result = Dart_ListGetAsBytes(bytes, 0, buffer, bytes_length);
   buffer[bytes_length] = '\0';
-  if (Dart_IsError(result)) Dart_PropagateError(result);
+  if (Dart_IsError(result)) {
+    Dart_PropagateError(result);
+  }
   intptr_t len;
-  char* str =
-      StringUtils::ConsoleStringToUtf8(
-          reinterpret_cast<char*>(buffer),
-          bytes_length,
-          &len);
+  char* str = StringUtils::ConsoleStringToUtf8(
+      reinterpret_cast<char*>(buffer), bytes_length, &len);
   if (str == NULL) {
     Dart_ThrowException(
         DartUtils::NewInternalError("SystemEncodingToString failed"));
   }
   result =
       Dart_NewStringFromUTF8(reinterpret_cast<const uint8_t*>(str), len);
-  free(str);
   Dart_SetReturnValue(args, result);
 }
 
 
 void FUNCTION_NAME(StringToSystemEncoding)(Dart_NativeArguments args) {
   Dart_Handle str = Dart_GetNativeArgument(args, 0);
   char* utf8;
   intptr_t utf8_len;
   Dart_Handle result = Dart_StringToUTF8(
       str, reinterpret_cast<uint8_t **>(&utf8), &utf8_len);
   if (Dart_IsError(result)) {
     Dart_PropagateError(result);
   }
   intptr_t system_len;
   const char* system_string =
       StringUtils::Utf8ToConsoleString(utf8, utf8_len, &system_len);
   if (system_string == NULL) {
     Dart_ThrowException(
         DartUtils::NewInternalError("StringToSystemEncoding failed"));
   }
   uint8_t* buffer = NULL;
   Dart_Handle external_array = IOBuffer::Allocate(system_len, &buffer);
   if (!Dart_IsError(external_array)) {
     memmove(buffer, system_string, system_len);
   }
   Dart_SetReturnValue(args, external_array);
-  free(const_cast<char*>(system_string));
 }
 
 }  // namespace bin
 }  // namespace dart