generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-15 23:20:09 +02:00
Code Issues Projects Releases Wiki Activity

define a macro for heap object deletion in a unified manner (related to issue #1524)

Browse Source
This commit is contained in:
reza.ebrahimi
2015-08-17 00:35:11 +04:30
parent 9bf88bcc03
commit 1621c25ef0
19 changed files with 93 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tcp_connecter.cpp
View File

@@ -252,8 +252,7 @@ int zmq::tcp_connecter_t::open ()
// Resolve the address
if (addr->resolved.tcp_addr != NULL) {
delete addr->resolved.tcp_addr;
addr->resolved.tcp_addr = NULL;
LIBZMQ_DELETE(addr->resolved.tcp_addr);
}
addr->resolved.tcp_addr = new (std::nothrow) tcp_address_t ();
@@ -261,8 +260,7 @@ int zmq::tcp_connecter_t::open ()
int rc = addr->resolved.tcp_addr->resolve (
addr->address.c_str (), false, options.ipv6);
if (rc != 0) {
delete addr->resolved.tcp_addr;
addr->resolved.tcp_addr = NULL;
LIBZMQ_DELETE(addr->resolved.tcp_addr);
return -1;
}
zmq_assert (addr->resolved.tcp_addr != NULL);