diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-06-04 17:15:05 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-06-04 17:15:05 +0000 |
| commit | 904c74eb236e43b456690e96280ce35e54f69f93 (patch) | |
| tree | 4d5d0f76dcdb9769ea2b67aab52ff4a5d278a7b8 | |
| parent | b1ddf13bcfb8339cfb2446158db73f569b10408e (diff) | |
| download | ATCD-904c74eb236e43b456690e96280ce35e54f69f93.tar.gz | |
ChangeLogTag: Wed Jun 4 17:12:10 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ACE/ChangeLog | 12 | ||||
| -rw-r--r-- | ACE/ace/ACE.cpp | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index f72950de64b..45e0491ad2c 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,13 @@ +Wed Jun 4 17:12:10 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com> + + * ace/ACE.cpp (timestamp): + + Make sure to divide sizeof timebuf by sizeof (ACE_TCHAR) to + avoid buffer overflow. This is another instance of the same + problem fixed in: + + Mon Jun 2 15:26:57 UTC 2008 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + Wed Jun 4 16:05:54 UTC 2008 Steve Huston <shuston@riverace.com> * tests/Time_Value_Test.cpp: Added a test case for Bugzilla #3336 @@ -7,7 +17,7 @@ Wed Jun 4 14:36:55 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu> * ace/Monitor_Point_Registry.cpp: * ace/Monitor_Base.cpp: - + Disabled warning messages reporting an unsuccessful unbind of a monitor from the monitor point registry. In some cases, it appears that the default process reactor singleton diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 391fa2844bf..539db4fa5f7 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -2444,7 +2444,7 @@ ACE::timestamp (ACE_TCHAR date_and_time[], ACE_OS::ctime_r (&secs, timebuf, - sizeof timebuf); + sizeof timebuf / sizeof (ACE_TCHAR)); // date_and_timelen > sizeof timebuf! ACE_OS::strsncpy (date_and_time, timebuf, |