diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2009-06-24 03:10:57 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2009-06-24 03:10:57 +0000 |
| commit | 50c27ec4c732183ffc770914716194683a54da3c (patch) | |
| tree | 2e63e11e4f46b19259d94a7453372346af4fb1ee | |
| parent | 6828ec7d89523bcec041171244cb6bb117bc4ffe (diff) | |
| download | ATCD-50c27ec4c732183ffc770914716194683a54da3c.tar.gz | |
ChangeLogTag:Sun
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/THANKS | 1 | ||||
| -rw-r--r-- | ACE/ace/Log_Msg.cpp | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 8cbb8510d22..89758d70ce1 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Sun Jun 21 14:34:13 UTC 2009 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Log_Msg.cpp (log): Changed the use of + ACE_Log_Record::MAXLOGMSGLEN to ACE_MAXLOGMSGLEN to avoid + problems with "off-by-one" buffer overflow errors. Thanks to + Brendan Murphy <brendan dot murphy at euro dot apple dot com> + for contributing this. + Tue Jun 23 20:12:51 UTC 2009 Adam Mitz <mitza@ociweb.com> * ace/Argv_Type_Converter.cpp: diff --git a/ACE/THANKS b/ACE/THANKS index 57e4611943e..f139c962211 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2292,6 +2292,7 @@ Rob Beekmans <r dot a dot beekmans at philips dot com> Steven Hartmann <shartmann at militho dot com> Dicky <qianchendi at gmail dot com> Boyan Kasarov <bkasarov at gmail dot com> +Brendan Murphy <brendan dot murphy at euro dot apple dot com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index ce445120de9..5c6d75287ac 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -1025,7 +1025,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, // bp is pointer to where to put next part of logged message. // bspace is the number of characters remaining in msg_. ACE_TCHAR *bp = const_cast<ACE_TCHAR *> (this->msg ()); - size_t bspace = ACE_Log_Record::MAXLOGMSGLEN; // Leave room for Nul term. + size_t bspace = ACE_MAXLOGMSGLEN; // Leave room for Nul term. if (this->msg_off_ <= ACE_Log_Record::MAXLOGMSGLEN) bspace -= static_cast<size_t> (this->msg_off_); |