diff options
| author | Olli Savia <ops@iki.fi> | 2009-10-29 08:09:29 +0000 |
|---|---|---|
| committer | Olli Savia <ops@iki.fi> | 2009-10-29 08:09:29 +0000 |
| commit | b190cff0b8b8b40e4c64fc171a1796ba119b9032 (patch) | |
| tree | abc318dccaf54c7183c5bbf566585b239c4fc8ed | |
| parent | a4c7b5bf3674abb10223a14dd895db985d01fdfc (diff) | |
| download | ATCD-b190cff0b8b8b40e4c64fc171a1796ba119b9032.tar.gz | |
ChangeLogTag: Thu Oct 29 08:08:51 UTC 2009 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/Log_Msg.cpp | 14 | ||||
| -rw-r--r-- | ACE/ace/Select_Reactor_Base.cpp | 4 |
3 files changed, 15 insertions, 9 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 2db9d44310a..030f8e8314c 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Thu Oct 29 08:08:51 UTC 2009 Olli Savia <ops@iki.fi> + + * ace/Log_Msg.cpp: + * ace/Select_Reactor_Base.cpp: + Fixed fuzz errors. + Wed Oct 28 19:49:39 UTC 2009 Chris Cleeland <cleeland@ociweb.com> * ace/Select_Reactor_Base.h: diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index 44d14110338..0ee5ca92de6 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -1633,13 +1633,13 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, case 'S': // format the string for with this signal number. { const int sig = va_arg (argp, int); - ACE_OS::strcpy (fp, ACE_TEXT ("s")); - if (can_check) - this_len = ACE_OS::snprintf - (bp, bspace, format, ACE_OS::strsignal(sig)); - else - this_len = ACE_OS::sprintf - (bp, format, ACE_OS::strsignal(sig)); + ACE_OS::strcpy (fp, ACE_TEXT ("s")); + if (can_check) + this_len = ACE_OS::snprintf + (bp, bspace, format, ACE_OS::strsignal(sig)); + else + this_len = ACE_OS::sprintf + (bp, format, ACE_OS::strsignal(sig)); ACE_UPDATE_COUNT (bspace, this_len); break; } diff --git a/ACE/ace/Select_Reactor_Base.cpp b/ACE/ace/Select_Reactor_Base.cpp index 7f37dc89808..2c45a7ce0ff 100644 --- a/ACE/ace/Select_Reactor_Base.cpp +++ b/ACE/ace/Select_Reactor_Base.cpp @@ -902,8 +902,8 @@ ACE_Select_Reactor_Notify::read_notify_pipe (ACE_HANDLE handle, // won't be aligned correctly. I'm not sure quite what to // do at this point. It's probably best just to return -1. if (ACE::recv_n (handle, - ((char *) &buffer) + n, - remainder) != remainder) + ((char *) &buffer) + n, + remainder) != remainder) return -1; } |