From aa73a9d16ae3f1f67e7a26a5119a36ec6a701394 Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Tue, 3 Nov 2020 10:38:44 +0100 Subject: [PATCH] Assert nullptrs in VehicleData we'll nuke this file anyways, but for now lets be safe about ptrs. --- src/Network/VehicleData.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Network/VehicleData.cpp b/src/Network/VehicleData.cpp index 4f91b34..17c68b8 100644 --- a/src/Network/VehicleData.cpp +++ b/src/Network/VehicleData.cpp @@ -32,6 +32,7 @@ SOCKET UDPSock; std::set DataAcks; std::set SplitPackets; void UDPSend(Client* c, std::string Data) { + Assert(c); if (c == nullptr || !c->isConnected || c->GetStatus() < 0) return; sockaddr_in Addr = c->GetUDPAddr(); @@ -82,6 +83,7 @@ int SplitID() { return SID; } void SendLarge(Client* c, std::string Data) { + Assert(c); Data = Data.substr(0, Data.find(char(0))); int ID = PacktID(); std::string Packet; @@ -118,6 +120,7 @@ void ResetIDs(HandledC* H) { } } HandledC* GetHandled(Client* c) { + Assert(c); for (HandledC* h : HandledIDs) { if (h->c == c) { return h; @@ -126,6 +129,7 @@ HandledC* GetHandled(Client* c) { return new HandledC(); } bool Handled(Client* c, int ID) { + Assert(c); bool handle = false; for (HandledC* h : HandledIDs) { if (h->c == c) { @@ -184,6 +188,7 @@ SplitData* GetSplit(int SplitID) { return SP; } void HandleChunk(Client* c, const std::string& Data) { + Assert(c); int pos = FC(Data, "|", 5); if (pos == -1) return; @@ -219,6 +224,7 @@ void HandleChunk(Client* c, const std::string& Data) { } } void UDPParser(Client* c, std::string Packet) { + Assert(c); if (Packet.substr(0, 4) == "ABG:") { Packet = DeComp(Packet.substr(4)); }