diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1998-06-16 21:21:16 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1998-06-16 21:21:16 +0000 |
| commit | 2aa31327090bc68161172d6141a76b6514ff23da (patch) | |
| tree | faff663bda8064415858a9317b99778a98f7660e | |
| parent | f3df982f7e3580237cc7faae10ed68e5b8eb4ae3 (diff) | |
| download | ATCD-2aa31327090bc68161172d6141a76b6514ff23da.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-98b | 6 | ||||
| -rw-r--r-- | ace/FILE_Addr.cpp | 11 | ||||
| -rw-r--r-- | ace/FILE_Addr.h | 1 |
3 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b index 40f1b6a3fb7..a083657aa8b 100644 --- a/ChangeLog-98b +++ b/ChangeLog-98b @@ -1,3 +1,9 @@ +Tue Jun 16 16:18:08 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/FILE_Addr.cpp (operator=): Check to make sure we + NUL-terminate the memcpy'd filename correctly. Thanks to Istvan + Buki <ibuki@fedex.com> for reporting this. + Tue Jun 16 15:43:55 1998 Nanbor Wang <nanbor@cs.wustl.edu> * ACE-INSTALL.html: Changed to instruct users to #include diff --git a/ace/FILE_Addr.cpp b/ace/FILE_Addr.cpp index 29095b31577..108b8c99f0e 100644 --- a/ace/FILE_Addr.cpp +++ b/ace/FILE_Addr.cpp @@ -44,9 +44,14 @@ ACE_FILE_Addr & ACE_FILE_Addr::operator= (const ACE_FILE_Addr &sa) { if (this != &sa) - (void) ACE_OS::memcpy ((void *) &this->filename_, - (void *) &sa.filename_, - sa.get_size ()); + { + size_t size = sa.get_size (); + (void) ACE_OS::memcpy ((void *) &this->filename_, + (void *) &sa.filename_, + size); + if (size < MAXNAMLEN + 1) + this->filename_[size] = '\0'; + } return *this; } diff --git a/ace/FILE_Addr.h b/ace/FILE_Addr.h index d926a6a61d0..d1458539596 100644 --- a/ace/FILE_Addr.h +++ b/ace/FILE_Addr.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY |