Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(495)

Unified Diff: runtime/bin/process_macos.cc

Issue 1781883002: Fixes some memory leaks in //runtime/bin (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Fix tests on Windows Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/bin/process_linux.cc ('k') | runtime/bin/process_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/process_macos.cc
diff --git a/runtime/bin/process_macos.cc b/runtime/bin/process_macos.cc
index 1ce34f99149e5b17fec74d18f278cfee655defd0..00869a1440bc6cbae0d53743d6236a8a8af15e07 100644
--- a/runtime/bin/process_macos.cc
+++ b/runtime/bin/process_macos.cc
@@ -19,6 +19,7 @@
#include <string.h> // NOLINT
#include <unistd.h> // NOLINT
+#include "bin/dartutils.h"
#include "bin/fdutils.h"
#include "bin/lockers.h"
#include "bin/log.h"
@@ -292,7 +293,9 @@ class ProcessStarter {
int Start() {
// Create pipes required.
int err = CreatePipes();
- if (err != 0) return err;
+ if (err != 0) {
+ return err;
+ }
// Fork to create the new process.
pid_t pid = TEMP_FAILURE_RETRY(fork());
@@ -312,7 +315,9 @@ class ProcessStarter {
// Register the child process if not detached.
if (mode_ == kNormal) {
err = RegisterProcess(pid);
- if (err != 0) return err;
+ if (err != 0) {
+ return err;
+ }
}
// Notify child process to start. This is done to delay the call to exec
@@ -651,7 +656,9 @@ class ProcessStarter {
int actual_errno = errno;
// If CleanupAndReturnError is called without an actual errno make
// sure to return an error anyway.
- if (actual_errno == 0) actual_errno = EPERM;
+ if (actual_errno == 0) {
+ actual_errno = EPERM;
+ }
SetChildOsErrorMessage();
CloseAllPipes();
return actual_errno;
@@ -660,9 +667,9 @@ class ProcessStarter {
void SetChildOsErrorMessage() {
const int kBufferSize = 1024;
- char error_message[kBufferSize];
+ char* error_message = DartUtils::ScopedCString(kBufferSize);
Utils::StrError(errno, error_message, kBufferSize);
- *os_error_message_ = strdup(error_message);
+ *os_error_message_ = error_message;
}
@@ -697,7 +704,7 @@ class ProcessStarter {
void ReadChildError() {
const int kMaxMessageSize = 256;
- char* message = static_cast<char*>(malloc(kMaxMessageSize));
+ char* message = DartUtils::ScopedCString(kMaxMessageSize);
if (message != NULL) {
FDUtils::ReadFromBlocking(exec_control_[0], message, kMaxMessageSize);
message[kMaxMessageSize - 1] = '\0';
« no previous file with comments | « runtime/bin/process_linux.cc ('k') | runtime/bin/process_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698