ChangeLogTag:Mon

8 files changed, 16 insertions, 9 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index b02090b6d05..c2fd23d6174 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun  2 15:26:57 UTC 2008  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Log_Record.cpp (format_msg): Make sure to divide sizeof ctp
+          by sizeof (ACE_TCHAR) to avoid buffer overflow.  Thanks to June
+          Fang <june dot fang at gmail dot com> for reporting this.
+
 Sun Jun  1 02:01:38 UTC 2008  Ken Sedgwick  <ken+5a4@bonsai.com>
 
 	* rpmbuild/ace-tao.spec:
diff --git a/ACE/THANKS b/ACE/THANKS
index 323e30c3b2d..afaa19dc74d 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -2242,8 +2242,10 @@ Michael Carter <mcarter at swri dot org>
 Alain Kocelniak <alain at corys dot fr>
 Alvaro Vega Garcia <avega at tid dot es>
 Fernando C. Jeronymo <fernando dot fcavalcanti at gmail.com>
+Stephen Mouring <stephen dot mouring at lmco dot com>
 Tim <tim at burmair dot com>
 Thomas Brownridge <thomas dot brownridge at lmco dot com>
+June Fang <june dot fang at gmail 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_Record.cpp b/ACE/ace/Log_Record.cpp
index f790cf7d24c..55ebb78c821 100644
--- a/ACE/ace/Log_Record.cpp
+++ b/ACE/ace/Log_Record.cpp
@@ -240,7 +240,7 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[],
       time_t const now = this->secs_;
       ACE_TCHAR ctp[26]; // 26 is a magic number...
 
-      if (ACE_OS::ctime_r (&now, ctp, sizeof ctp) == 0)
+      if (ACE_OS::ctime_r (&now, ctp, sizeof ctp / sizeof (ACE_TCHAR)) == 0)
         return -1;
 
       /* 01234567890123456789012345 */
diff --git a/ACE/ace/SSL/SSL_SOCK_Acceptor.h b/ACE/ace/SSL/SSL_SOCK_Acceptor.h
index 0c4609c2c73..ae1c13ccdf8 100644
--- a/ACE/ace/SSL/SSL_SOCK_Acceptor.h
+++ b/ACE/ace/SSL/SSL_SOCK_Acceptor.h
@@ -12,7 +12,6 @@
  */
 //=============================================================================
 
-
 #ifndef ACE_SSL_SOCK_ACCEPTOR_H
 #define ACE_SSL_SOCK_ACCEPTOR_H
 
diff --git a/ACE/ace/Service_Object.cpp b/ACE/ace/Service_Object.cpp
index 3362f0333b2..f3ca42b25f3 100644
--- a/ACE/ace/Service_Object.cpp
+++ b/ACE/ace/Service_Object.cpp
@@ -114,8 +114,8 @@ ACE_Service_Type::fini (void)
   // Ensure that closing the DLL is done after type_->fini() as it may
   // require access to the code for the service object destructor,
   // which resides in the DLL
-  return (ret | this->dll_.close());
 
+  return (ret | this->dll_.close ());
 }
 
 int
diff --git a/ACE/ace/Service_Types.cpp b/ACE/ace/Service_Types.cpp
index 1bd5856d21f..ce5d0bb9a52 100644
--- a/ACE/ace/Service_Types.cpp
+++ b/ACE/ace/Service_Types.cpp
@@ -374,8 +374,8 @@ ACE_Stream_Type::fini (void) const
       m->fini ();
       m = t;
     }
-
   str->close ();
+
   return ACE_Service_Type_Impl::fini ();
 }
 
diff --git a/ACE/examples/ASX/CCM_App/svc.conf b/ACE/examples/ASX/CCM_App/svc.conf
index b894e6e69e5..6ec1bafa39e 100644
--- a/ACE/examples/ASX/CCM_App/svc.conf
+++ b/ACE/examples/ASX/CCM_App/svc.conf
@@ -12,10 +12,10 @@ stream dynamic CCM_App STREAM *CCM_App:make_stream() active
 stream CCM_App
 {
   remove Device_Adapter
-#  remove Event_Analyzer
-#  remove Multicast_Router
+  remove Event_Analyzer
+  remove Multicast_Router
 }
  
-# remove CCM_App
+remove CCM_App
 remove Test_Task
 
diff --git a/ACE/include/makeinclude/platform_linux.GNU b/ACE/include/makeinclude/platform_linux.GNU
index a80ee19d934..710935e7419 100644
--- a/ACE/include/makeinclude/platform_linux.GNU
+++ b/ACE/include/makeinclude/platform_linux.GNU
@@ -63,8 +63,8 @@ endif
 # for you): _SVID_SOURCE _BSD_SOURCE _POSIX_SOURCE _POSIX_C_SOURCE=199506L, ...
 CPPFLAGS += -D_GNU_SOURCE
 
-DCFLAGS  += -g
-DCCFLAGS += -g
+DCFLAGS  += -ggdb
+DCCFLAGS += -ggdb
 DLD      = $(CXX)
 LD       = $(CXX)
 LIBS     += -ldl