diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-05-29 20:09:10 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-05-29 20:39:09 -0400 |
| commit | a3ae20fc15cedbd9fc2bf06e44484bceeb2e60f7 (patch) | |
| tree | 69bb7b165b15106e8b323308b206289a8f03900f /Source/Core | |
| parent | 30973459292d734fac12d1fefaf98edf37ad7976 (diff) | |
Remove the use of a delete[] in NetPlayServer.
We just use a vector instead of a raw pointer.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/NetPlayServer.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp index c7145079bf..a84373c271 100644 --- a/Source/Core/Core/NetPlayServer.cpp +++ b/Source/Core/Core/NetPlayServer.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include <vector> + #include "Core/NetPlayServer.h" NetPlayServer::~NetPlayServer() @@ -424,15 +426,14 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, sf::SocketTCP& socket) PadMapping map = 0; u8 size; packet >> map >> size; - u8* data = new u8[size]; - for (unsigned int i = 0; i < size; ++i) + std::vector<u8> data(size); + for (size_t i = 0; i < data.size(); ++i) packet >> data[i]; // If the data is not from the correct player, // then disconnect them. if (m_wiimote_map[map] != player.pid) { - delete[] data; return 1; } @@ -441,10 +442,8 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, sf::SocketTCP& socket) spac << (MessageId)NP_MSG_WIIMOTE_DATA; spac << map; spac << size; - for (unsigned int i = 0; i < size; ++i) - spac << data[i]; - - delete[] data; + for (const u8& byte : data) + spac << byte; std::lock_guard<std::recursive_mutex> lks(m_crit.send); SendToClients(spac, player.pid); |
