diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2003-05-25 14:29:19 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2003-05-25 14:29:19 +0000 |
| commit | c6d71746322abd9def9f706f4381f4ce1026d5ee (patch) | |
| tree | acdc2c3a3a73232f90919e6e6166b54503f135c8 | |
| parent | f655ec78637e15ee61c40071f4615c68b4998f0b (diff) | |
| download | ATCD-c6d71746322abd9def9f706f4381f4ce1026d5ee.tar.gz | |
ChangeLogTag:Sun May 25 09:27:43 2003 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ace/Malloc_T.i | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 2ce85d16286..b4063bcadb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun May 25 09:27:43 2003 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Malloc_T.i (free): Added a check for a NULL ptr to prevent + system crashes. Thanks to Leonid Kvetnyi <leonidk@nice.com> for + reporting this. + Sun May 25 10:06:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * ace/config-cygwin32.h: diff --git a/ace/Malloc_T.i b/ace/Malloc_T.i index 6093977e5bc..4dbe282ab51 100644 --- a/ace/Malloc_T.i +++ b/ace/Malloc_T.i @@ -102,7 +102,8 @@ ACE_Dynamic_Cached_Allocator<ACE_LOCK>::calloc (size_t, size_t, char) template <class ACE_LOCK> ACE_INLINE void ACE_Dynamic_Cached_Allocator<ACE_LOCK>::free (void * ptr) { - this->free_list_.add ((ACE_Cached_Mem_Pool_Node<char> *) ptr); + if (ptr != 0) + this->free_list_.add ((ACE_Cached_Mem_Pool_Node<char> *) ptr); } template <class MALLOC> ACE_INLINE void * |