diff options
| author | Adam Mitz <mitza-oci@users.noreply.github.com> | 2009-07-06 20:52:40 +0000 |
|---|---|---|
| committer | Adam Mitz <mitza-oci@users.noreply.github.com> | 2009-07-06 20:52:40 +0000 |
| commit | 38245bc8b7c56df8f9dad4ddf86afea3777eb760 (patch) | |
| tree | 6c61c144c626e627686867421c3f584dbde1e239 | |
| parent | 2a5eb5b3aae9ed04d2534c524991a5253c14805b (diff) | |
| download | ATCD-38245bc8b7c56df8f9dad4ddf86afea3777eb760.tar.gz | |
ChangeLogTag: Mon Jul 6 20:33:00 UTC 2009 Adam Mitz <mitza@ociweb.com>
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_unistd.cpp | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index ede70d5fd8f..3d3d972309d 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Mon Jul 6 20:33:00 UTC 2009 Adam Mitz <mitza@ociweb.com> + + * ace/OS_NS_unistd.cpp: + + Fixed a bug where the number of bytes passed to ACE_OS::malloc is + incorrect for ACE_USES_WCHAR (each character can be > 1 byte). + Mon Jul 6 18:25:23 UTC 2009 Adam Mitz <mitza@ociweb.com> * ace/config-macosx-leopard.h: diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp index 033a1e36fb3..8f48a8e3f24 100644 --- a/ACE/ace/OS_NS_unistd.cpp +++ b/ACE/ace/OS_NS_unistd.cpp @@ -136,7 +136,8 @@ ACE_OS::argv_to_string (int argc, ++quotes; } argv_p[i] = - (ACE_TCHAR *) ACE_OS::malloc (ACE_OS::strlen (temp) * sizeof (ACE_TCHAR) + quotes + 3); + (ACE_TCHAR *) ACE_OS::malloc ((ACE_OS::strlen (temp) + quotes + 3) + * sizeof (ACE_TCHAR)); if (argv_p[i] == 0) { ACE_OS::free (argv_p); |