add bounds check

Author: Jnnshschl

AmeisenNavigation.Server/src/Main.cpp

@@ -133,19 +133,19 @@ void OnClientConnect(ClientHandler* handler)
 {
     LogI("Client Connected: ", handler->GetIpAddress(), ":", handler->GetPort());
 
-    ClientPathBuffers[handler->GetUniqueId()] = std::make_pair(new float[Config->maxPointPath * 3], new float[Config->maxPointPath * 3]);
-    Nav->NewClient(handler->GetUniqueId());
+    ClientPathBuffers[handler->GetId()] = std::make_pair(new float[Config->maxPointPath * 3], new float[Config->maxPointPath * 3]);
+    Nav->NewClient(handler->GetId());
 }
 
 void OnClientDisconnect(ClientHandler* handler)
 {
-    Nav->FreeClient(handler->GetUniqueId());
+    Nav->FreeClient(handler->GetId());
 
-    delete[] ClientPathBuffers[handler->GetUniqueId()].first;
-    ClientPathBuffers[handler->GetUniqueId()].first = nullptr;
+    delete[] ClientPathBuffers[handler->GetId()].first;
+    ClientPathBuffers[handler->GetId()].first = nullptr;
 
-    delete[] ClientPathBuffers[handler->GetUniqueId()].second;
-    ClientPathBuffers[handler->GetUniqueId()].second = nullptr;
+    delete[] ClientPathBuffers[handler->GetId()].second;
+    ClientPathBuffers[handler->GetId()].second = nullptr;
 
     LogI("Client Disconnected: ", handler->GetIpAddress(), ":", handler->GetPort());
 }
@@ -155,22 +155,22 @@ void PathCallback(ClientHandler* handler, char type, const void* data, int size)
     const PathRequestData request = *reinterpret_cast<const PathRequestData*>(data);
 
     int pathSize = 0;
-    float* pathBuffer = ClientPathBuffers[handler->GetUniqueId()].first;
+    float* pathBuffer = ClientPathBuffers[handler->GetId()].first;
 
-    if (Nav->GetPath(handler->GetUniqueId(), request.mapId, request.start, request.end, pathBuffer, &pathSize))
+    if (Nav->GetPath(handler->GetId(), request.mapId, request.start, request.end, pathBuffer, &pathSize))
     {
         if ((request.flags & static_cast<int>(PathRequestFlags::CATMULLROM)) && pathSize > 9)
         {
             int smoothedPathSize = 0;
-            float* smoothedPathBuffer = ClientPathBuffers[handler->GetUniqueId()].second;
+            float* smoothedPathBuffer = ClientPathBuffers[handler->GetId()].second;
             Nav->SmoothPathCatmullRom(pathBuffer, pathSize, smoothedPathBuffer, &smoothedPathSize, Config->catmullRomSplinePoints, Config->catmullRomSplineAlpha);
 
             handler->SendData(type, smoothedPathBuffer, smoothedPathSize * sizeof(float));
         }
         else if ((request.flags & static_cast<int>(PathRequestFlags::CHAIKIN)) && pathSize > 6)
         {
             int smoothedPathSize = 0;
-            float* smoothedPathBuffer = ClientPathBuffers[handler->GetUniqueId()].second;
+            float* smoothedPathBuffer = ClientPathBuffers[handler->GetId()].second;
             Nav->SmoothPathChaikinCurve(pathBuffer, pathSize, smoothedPathBuffer, &smoothedPathSize);
 
             handler->SendData(type, smoothedPathBuffer, smoothedPathSize * sizeof(float));
@@ -192,7 +192,7 @@ void RandomPointCallback(ClientHandler* handler, char type, const void* data, in
     const int mapId = *reinterpret_cast<const int*>(data);
     float point[3]{};
 
-    Nav->GetRandomPoint(handler->GetUniqueId(), mapId, point);
+    Nav->GetRandomPoint(handler->GetId(), mapId, point);
     handler->SendData(type, point, VEC3_SIZE);
 }
 
@@ -201,7 +201,7 @@ void RandomPointAroundCallback(ClientHandler* handler, char type, const void* da
     const RandomPointAroundData request = *reinterpret_cast<const RandomPointAroundData*>(data);
     float point[3]{};
 
-    Nav->GetRandomPointAround(handler->GetUniqueId(), request.mapId, request.start, request.radius, point);
+    Nav->GetRandomPointAround(handler->GetId(), request.mapId, request.start, request.radius, point);
     handler->SendData(type, point, VEC3_SIZE);
 }
 
@@ -210,7 +210,7 @@ void MoveAlongSurfaceCallback(ClientHandler* handler, char type, const void* dat
     const MoveRequestData request = *reinterpret_cast<const MoveRequestData*>(data);
     float point[3]{};
 
-    Nav->MoveAlongSurface(handler->GetUniqueId(), request.mapId, request.start, request.end, point);
+    Nav->MoveAlongSurface(handler->GetId(), request.mapId, request.start, request.end, point);
     handler->SendData(type, point, VEC3_SIZE);
 }
 
@@ -219,7 +219,7 @@ void CastRayCallback(ClientHandler* handler, char type, const void* data, int si
     const CastRayData request = *reinterpret_cast<const CastRayData*>(data);
     dtRaycastHit hit;
 
-    if (Nav->CastMovementRay(handler->GetUniqueId(), request.mapId, request.start, request.end, &hit))
+    if (Nav->CastMovementRay(handler->GetId(), request.mapId, request.start, request.end, &hit))
     {
         handler->SendData(type, request.end, VEC3_SIZE);
     }

AmeisenNavigation/src/AmeisenNavigation.cpp

@@ -236,8 +236,14 @@ void AmeisenNavigation::SmoothPathChaikinCurve(const float* input, int inputSize
 
     float result[3];
 
+    // make sure we dont go over the buffer bounds
+    // why 10: we add 6 floats in the loop and 3 for the end position
+    const int maxIndex = MaxPointPath - 10;
+
     for (int i = 0; i < inputSize - 3; i += 3)
     {
+        if (*outputSize > maxIndex) { break; }
+
         ScaleAndAddVector3(input + i, 0.75f, input + i + 3, 0.25f, s0, s1, result);
         InsertVector3(output, *outputSize, result, 0);
 
@@ -265,6 +271,10 @@ void AmeisenNavigation::SmoothPathCatmullRom(const float* input, int inputSize,
 
     float C[3];
 
+    // make sure we dont go over the buffer bounds
+    // why 4: we add 3 floats in the loop
+    const int maxIndex = MaxPointPath - 4;
+
     for (int i = 3; i < inputSize - 6; i += 3)
     {
         const float* p0 = input + i - 3;
@@ -291,6 +301,8 @@ void AmeisenNavigation::SmoothPathCatmullRom(const float* input, int inputSize,
 
             if (!std::isnan(C[0]) && !std::isnan(C[1]) && !std::isnan(C[2]))
             {
+                if (*outputSize > maxIndex) { return; }
+
                 InsertVector3(output, *outputSize, C, 0);
             }
         }

dep/AnTCP.Server/include/AnTcpServer.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 // toggle debug output here
-#if 1
+#if 0
 #define DEBUG_ONLY(x) x
 #define BENCHMARK(x) x
 #else
@@ -72,7 +72,6 @@ class ClientHandler
     /// <param name="callbacks">Pointer to the server callback map.</param>
     ClientHandler
     (
-        size_t id,
         SOCKET socket,
         const SOCKADDR_IN& socketInfo,
         std::atomic<bool>& shouldExit,
@@ -81,10 +80,9 @@ class ClientHandler
         std::function<void(ClientHandler*)>* onClientDisconnected = nullptr
     )
         : IsActive(true),
-        Id(id),
+        Id(static_cast<unsigned int>(socketInfo.sin_addr.S_un.S_addr + socketInfo.sin_port)),
         Socket(socket),
         SocketInfo(socketInfo),
-        UniqueId(static_cast<unsigned int>(socketInfo.sin_addr.S_un.S_addr + socketInfo.sin_port)),
         ShouldExit(shouldExit),
         Callbacks(callbacks),
         Thread(new std::thread(&ClientHandler::Listen, this)),
@@ -110,11 +108,6 @@ class ClientHandler
     /// </summary>
     constexpr int GetId() noexcept { return Id; }
 
-    /// <summary>
-    /// Get a unique id based on ip and port of the handler.
-    /// </summary>
-    constexpr unsigned int GetUniqueId() noexcept { return UniqueId; }
-
     /// <summary>
     /// Used to delete old disconnected clients.
     /// </summary>