Changeset 140922 in webkit

Timestamp:

Jan 26, 2013 5:36:36 PM (11 years ago)

Author:

weinig@apple.com

Message:

Simplify environment creation in XPC service re-exec
​https://bugs.webkit.org/show_bug.cgi?id=108017

Reviewed by Dan Bernstein.

• Shared/EntryPointUtilities/mac/XPCService/XPCServiceBootstrapper.Development.h:

(WebKit::XPCServiceEventHandler):
There is no need to copy these strings.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/EntryPointUtilities/mac/XPCService/XPCServiceBootstrapper.Development.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-26  Sam Weinig  <sam@webkit.org>
+
+        Simplify environment creation in XPC service re-exec
+        https://bugs.webkit.org/show_bug.cgi?id=108017
+
+        Reviewed by Dan Bernstein.
+
+        * Shared/EntryPointUtilities/mac/XPCService/XPCServiceBootstrapper.Development.h:
+        (WebKit::XPCServiceEventHandler):
+        There is no need to copy these strings.
+
 2013-01-26  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceBootstrapper.Development.h

@@ -97 +97 @@
                 size_t numberOfEnvironmentVariables = xpc_array_get_count(environmentArray);
 
-                char** environment = (char**)malloc(numberOfEnvironmentVariables * sizeof(char*) + 1);
-                for (size_t i = 0; i < numberOfEnvironmentVariables; ++i) {
-                    const char* string =  xpc_array_get_string(environmentArray, i);
-                    size_t stringLength = strlen(string);
-
-                    char* environmentVariable = (char*)malloc(stringLength + 1);
-                    memcpy(environmentVariable, string, stringLength);
-                    environmentVariable[stringLength] = '\0';
-
-                    environment[i] = environmentVariable;
-                }
+                const char** environment = (const char**)malloc(numberOfEnvironmentVariables * sizeof(char*) + 1);
+                for (size_t i = 0; i < numberOfEnvironmentVariables; ++i)
+                    environment[i] = xpc_array_get_string(environmentArray, i);
                 environment[numberOfEnvironmentVariables] = 0;
 
                 pid_t processIdentifier = 0;
-                posix_spawn(&processIdentifier, path, 0, &attr, const_cast<char**>(args), environment);
+                posix_spawn(&processIdentifier, path, 0, &attr, const_cast<char**>(args), const_cast<char**>(environment));
 
                 posix_spawnattr_destroy(&attr);