From a2345d1f45870eb00a2a3d5d6fd21a386efcade3 Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Sun, 27 Jan 2019 17:01:35 +0500
Subject: Replaced "new/delete" with safer analogues

---
 src/Network.cpp | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'src/Network.cpp')

diff --git a/src/Network.cpp b/src/Network.cpp
index c8be740..431a5b1 100644
--- a/src/Network.cpp
+++ b/src/Network.cpp
@@ -7,24 +7,16 @@
 
 Network::Network(std::string address, unsigned short port) {
 	try {
-		socket = new Socket(address, port);
+		socket = std::make_unique<Socket>(address, port);
+		stream = std::make_unique<StreamSocket>(socket.get());
 	} catch (std::exception &e) {
 		LOG(WARNING) << "Connection failed: " << e.what();
 		throw;
-	}
-
-	try {
-		stream = new StreamSocket(socket);
-	} catch (std::exception &e) {
-		LOG(WARNING) << "Stream creation failed: " << e.what();
-	}
-
-
+	}	
 }
 
 Network::~Network() {
-	delete stream;
-	delete socket;
+
 }
 
 std::shared_ptr<Packet> Network::ReceivePacket(ConnectionState state, bool useCompression) {
@@ -94,7 +86,7 @@ void Network::SendPacket(Packet &packet, int compressionThreshold) {
             stream->WriteVarInt(packetSize.GetCountedSize());
             stream->WriteVarInt(0);
             stream->WriteVarInt(packet.GetPacketId());
-            packet.ToStream(stream);
+            packet.ToStream(stream.get());
         } else {
             throw std::runtime_error("Compressing send data not supported");
         }
@@ -105,7 +97,7 @@ void Network::SendPacket(Packet &packet, int compressionThreshold) {
         packet.ToStream(&packetSize);
         stream->WriteVarInt(packetSize.GetCountedSize());
         stream->WriteVarInt(packet.GetPacketId());
-        packet.ToStream(stream);
+        packet.ToStream(stream.get());
     }	
 }
 
-- 
cgit v1.2.3