summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2011-05-23 07:11:11 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2011-05-23 07:11:11 +0000
commit0820ce390cf17289f114bee4db92ac636914eaa6 (patch)
tree2847ab4849d092776a3b3c2673000ad89b9065f2
parentc9aa228cb19e955d80971f572ca3da448b0d81a8 (diff)
downloadATCD-0820ce390cf17289f114bee4db92ac636914eaa6.tar.gz
Mon May 23 07:10:41 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/APG/Naming/Name_Binding.h: * netsvcs/lib/Client_Logging_Handler.cpp: Fixed incorrect delete
-rw-r--r--ACE/ChangeLog6
-rw-r--r--ACE/examples/APG/Naming/Name_Binding.h4
-rw-r--r--ACE/netsvcs/lib/Client_Logging_Handler.cpp2
3 files changed, 9 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index e7763d30089..39dcee4fb80 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Mon May 23 07:10:41 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * examples/APG/Naming/Name_Binding.h:
+ * netsvcs/lib/Client_Logging_Handler.cpp:
+ Fixed incorrect delete
+
Mon May 23 06:55:37 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/APG/Streams/MessageInfo.h:
diff --git a/ACE/examples/APG/Naming/Name_Binding.h b/ACE/examples/APG/Naming/Name_Binding.h
index 6c093a941f2..1feecae91e4 100644
--- a/ACE/examples/APG/Naming/Name_Binding.h
+++ b/ACE/examples/APG/Naming/Name_Binding.h
@@ -31,8 +31,8 @@ public:
~Name_Binding ()
{
- delete this->name_;
- delete this->value_;
+ delete[] this->name_;
+ delete[] this->value_;
ACE_OS::free (const_cast<char*> (this->type_));
this->type_ = 0;
}
diff --git a/ACE/netsvcs/lib/Client_Logging_Handler.cpp b/ACE/netsvcs/lib/Client_Logging_Handler.cpp
index 9f725a99a44..18349dfd9af 100644
--- a/ACE/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/ACE/netsvcs/lib/Client_Logging_Handler.cpp
@@ -677,7 +677,7 @@ ACE_Client_Logging_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
ACE_TCHAR *local_addr_cstr = local_addr_str.rep ();
if (-1 == local_addr_.string_to_addr (ACE_TEXT_ALWAYS_CHAR (local_addr_cstr)))
ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), local_addr_cstr));
- delete local_addr_cstr;
+ delete [] local_addr_cstr;
}
if (this->server_addr_.set (this->server_port_,