Ensure derived struct instances are properly destructed (apache#217)

clamorel · Jun 19, 2023 · 43e01bf · 43e01bf
1 parent 64df3d4
commit 43e01bf
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 19 deletions.
diff --git a/src/main/cpp/aprsocket.cpp b/src/main/cpp/aprsocket.cpp
@@ -29,8 +29,9 @@ namespace helpers
 {
 
 struct APRSocket::APRSocketPriv : public Socket::SocketPrivate {
-	APRSocketPriv() :
-		socket(nullptr)
+	APRSocketPriv(InetAddressPtr& address, int port)
+		: Socket::SocketPrivate(address, port)
+		, socket(nullptr)
 	{}
 
 	APRSocketPriv(apr_socket_t* sock, apr_pool_t* p) :
@@ -45,7 +46,7 @@ struct APRSocket::APRSocketPriv : public Socket::SocketPrivate {
 #define _priv static_cast<APRSocketPriv*>(m_priv.get())
 
 APRSocket::APRSocket(InetAddressPtr& address, int port) :
-	Socket(std::make_unique<APRSocketPriv>()){
+	Socket(std::make_unique<APRSocketPriv>(address, port)){
 	apr_status_t status =
 		apr_socket_create(&_priv->socket, APR_INET, SOCK_STREAM,
 			APR_PROTO_TCP, _priv->pool.getAPRPool());

diff --git a/src/main/cpp/datagramsocket.cpp b/src/main/cpp/datagramsocket.cpp
@@ -84,15 +84,15 @@ DatagramSocketUniquePtr DatagramSocket::create(){
 }
 
 DatagramSocketUniquePtr DatagramSocket::create(int localPort1){
-	std::unique_ptr<APRDatagramSocket> sock = std::make_unique<APRDatagramSocket>();
+	auto sock = std::make_unique<APRDatagramSocket>(localPort1);
 	InetAddressPtr bindAddr = InetAddress::anyAddress();
 
 	sock->bind(localPort1, bindAddr);
 	return sock;
 }
 
 DatagramSocketUniquePtr DatagramSocket::create(int localPort1, InetAddressPtr localAddress1){
-	std::unique_ptr<APRDatagramSocket> sock = std::make_unique<APRDatagramSocket>();
+	auto sock = std::make_unique<APRDatagramSocket>(localPort1, localAddress1);
 
 	sock->bind(localPort1, localAddress1);
 	return sock;

diff --git a/src/main/include/log4cxx/private/datagramsocket_priv.h b/src/main/include/log4cxx/private/datagramsocket_priv.h
@@ -27,21 +27,23 @@ namespace helpers
 
 struct DatagramSocket::DatagramSocketPriv
 {
-        DatagramSocketPriv()
-	        : address(), localAddress(), port(0), localPort(0)
+	DatagramSocketPriv()
+		: port(0), localPort(0)
 	{
 	}
 
 	DatagramSocketPriv(int localPort1)
-	        : address(), localAddress(), port(0), localPort(0)
+		: port(0), localPort(localPort1)
 	{
 	}
 
 	DatagramSocketPriv(int localPort1, InetAddressPtr localAddress1)
-	        : address(), localAddress(), port(0), localPort(0)
+		: localAddress(localAddress1), port(0), localPort(localPort1)
 	{
 	}
 
+	~DatagramSocketPriv() = default;
+
 	InetAddressPtr address;
 
 	InetAddressPtr localAddress;

diff --git a/src/main/include/log4cxx/private/serversocket_priv.h b/src/main/include/log4cxx/private/serversocket_priv.h
@@ -26,10 +26,10 @@ namespace helpers
 {
 
 struct ServerSocket::ServerSocketPrivate{
-    ServerSocketPrivate() :
-        timeout(0){}
-
-    int timeout;
+	ServerSocketPrivate() :
+		timeout(0){}
+	virtual ~ServerSocketPrivate() = default;
+	int timeout;
 };
 
 }

diff --git a/src/main/include/log4cxx/private/socket_priv.h b/src/main/include/log4cxx/private/socket_priv.h
@@ -25,13 +25,17 @@ namespace log4cxx
 namespace helpers
 {
 
-struct Socket::SocketPrivate{
-    /** The IP address of the remote end of this socket. */
-    InetAddressPtr address;
+struct Socket::SocketPrivate
+{
+	SocketPrivate(const InetAddressPtr& addr = InetAddressPtr(), int _port = 0)
+		: address(addr), port(_port) {}
+	virtual ~SocketPrivate() = default;
+	/** The IP address of the remote end of this socket. */
+	InetAddressPtr address;
 
-    /** The port number on the remote host to which
-    this socket is connected. */
-    int port;
+	/** The port number on the remote host to which
+	this socket is connected. */
+	int port;
 };
 
 }