Title: [153969] trunk/Source/WebKit2
Revision
153969
Author
[email protected]
Date
2013-08-12 18:10:07 -0700 (Mon, 12 Aug 2013)

Log Message

Fixed an off-by-(sizeof(char*) - 1) bug.

Reviewed by Sam Weinig.

* Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm:
(WebKit::XPCServiceEventHandler): Allocate a sufficiently large buffer.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (153968 => 153969)


--- trunk/Source/WebKit2/ChangeLog	2013-08-13 00:35:45 UTC (rev 153968)
+++ trunk/Source/WebKit2/ChangeLog	2013-08-13 01:10:07 UTC (rev 153969)
@@ -1,3 +1,12 @@
+2013-08-12  Dan Bernstein  <[email protected]>
+
+        Fixed an off-by-(sizeof(char*) - 1) bug.
+
+        Reviewed by Sam Weinig.
+
+        * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm:
+        (WebKit::XPCServiceEventHandler): Allocate a sufficiently large buffer.
+
 2013-08-12  Beth Dakin  <[email protected]>
 
         Remove didNewFirstVisuallyNonEmptyLayout from WebKit2

Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm (153968 => 153969)


--- trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm	2013-08-13 00:35:45 UTC (rev 153968)
+++ trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm	2013-08-13 01:10:07 UTC (rev 153969)
@@ -108,7 +108,7 @@
 
                 xpc_object_t environmentArray = xpc_dictionary_get_value(event, "environment");
                 size_t numberOfEnvironmentVariables = xpc_array_get_count(environmentArray);
-                char** environment = static_cast<char **>(malloc(numberOfEnvironmentVariables * sizeof(char*) + 1));
+                char** environment = static_cast<char **>(malloc((numberOfEnvironmentVariables + 1) * sizeof(char*)));
                 for (size_t i = 0; i < numberOfEnvironmentVariables; ++i)
                     environment[i] = strdup(xpc_array_get_string(environmentArray, i));
                 environment[numberOfEnvironmentVariables] = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to