From 38245bc8b7c56df8f9dad4ddf86afea3777eb760 Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Mon, 6 Jul 2009 20:52:40 +0000 Subject: ChangeLogTag: Mon Jul 6 20:33:00 UTC 2009 Adam Mitz --- ACE/ChangeLog | 7 +++++++ ACE/ace/OS_NS_unistd.cpp | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) 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 + + * 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 * 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); -- cgit v1.2.1