Bump version to 3.9.1

Add dynamic export (#470 )
Testing builds with -Wl,--export-dynamic Closes #464 --- By creating this pull request, I understand that code that is AI generated or otherwise automatically generated may be rejected without further discussion. I declare that I fully understand all code I pushed into this PR, and wrote all this code myself and own the rights to this code.
2026-07-13 10:13:42 +00:00 · 2026-03-08 18:16:10 +01:00 · 2026-03-08 18:09:42 +01:00 · 2026-03-08 17:29:55 +01:00 · 2026-03-08 17:24:30 +01:00 · 2026-03-07 21:23:00 -07:00
15 changed files with 98 additions and 29 deletions
@@ -3,11 +3,11 @@ name: Linux
 on:
  push:
    branches:
-      - 'develop'
-      - 'minor'
+      - "develop"
+      - "minor"
  pull_request:

-env: 
+env:
  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
  VCPKG_FORCE_SYSTEM_BINARIES: 1
  CMAKE_BUILD_TYPE: "Release"
@@ -21,6 +21,8 @@ jobs:
        include:
          - distro: debian
            version: 12
+          - distro: debian
+            version: 13
          - distro: ubuntu
            version: 22.04
          - distro: ubuntu
@@ -30,7 +32,7 @@ jobs:
    steps:
      - name: get-cmake
        uses: lukka/get-cmake@v3.28.1
-            
+
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@v6
        with:
@@ -45,7 +47,7 @@ jobs:

      - uses: actions/checkout@v2
        with:
-          submodules: 'recursive'
+          submodules: "recursive"
          fetch-depth: 0

      - name: Git config safe directory
@@ -91,6 +93,8 @@ jobs:
        include:
          - distro: debian
            version: 12
+          - distro: debian
+            version: 13
          - distro: ubuntu
            version: 22.04
          - distro: ubuntu
@@ -100,7 +104,7 @@ jobs:
    steps:
      - name: get-cmake
        uses: lukka/get-cmake@v3.28.1
-            
+
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@v6
        with:
@@ -115,7 +119,7 @@ jobs:

      - uses: actions/checkout@v2
        with:
-          submodules: 'recursive'
+          submodules: "recursive"
          fetch-depth: 0

      - name: Git config safe directory
@@ -151,4 +155,3 @@ jobs:

      - name: Test
        run: ./bin/BeamMP-Server-tests
-
@@ -3,7 +3,7 @@ on:
  push:
    # Sequence of patterns matched against refs/tags
    tags:
-    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+      - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10

 env:
  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
@@ -14,8 +14,8 @@ jobs:
  create-release:
    runs-on: ubuntu-latest
    name: Create Release
-    outputs: 
-      upload_url: ${{ steps.create_release.outputs.upload_url }} 
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
    steps:
      - name: Create Release
        id: create_release
@@ -40,6 +40,8 @@ jobs:
        include:
          - distro: debian
            version: 12
+          - distro: debian
+            version: 13
          - distro: ubuntu
            version: 22.04
          - distro: ubuntu
@@ -49,7 +51,7 @@ jobs:
    steps:
      - name: get-cmake
        uses: lukka/get-cmake@v3.28.1
-            
+
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@v6
        with:
@@ -64,7 +66,7 @@ jobs:

      - uses: actions/checkout@v2
        with:
-          submodules: 'recursive'
+          submodules: "recursive"
          fetch-depth: 0

      - name: Git config safe directory
@@ -81,7 +83,7 @@ jobs:
        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh

      - name: Upload Release Asset
-        id: upload-release-asset 
+        id: upload-release-asset
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -110,6 +112,8 @@ jobs:
        include:
          - distro: debian
            version: 12
+          - distro: debian
+            version: 13
          - distro: ubuntu
            version: 22.04
          - distro: ubuntu
@@ -122,7 +126,7 @@ jobs:
    steps:
      - name: get-cmake
        uses: lukka/get-cmake@v3.28.1
-            
+
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@v6
        with:
@@ -137,7 +141,7 @@ jobs:

      - uses: actions/checkout@v2
        with:
-          submodules: 'recursive'
+          submodules: "recursive"
          fetch-depth: 0

      - name: Git config safe directory
@@ -154,7 +158,7 @@ jobs:
        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh

      - name: Upload Release Asset
-        id: upload-release-asset 
+        id: upload-release-asset
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -191,7 +195,7 @@ jobs:

      - uses: actions/checkout@v2
        with:
-          submodules: 'recursive'
+          submodules: "recursive"
          fetch-depth: 0

      - name: Create Build Environment
@@ -203,7 +207,7 @@ jobs:
        run: bash ./scripts/windows/2-build.sh

      - name: Upload Release Asset
-        id: upload-release-asset 
+        id: upload-release-asset
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -129,7 +129,7 @@ private:
    static inline std::mutex mShutdownHandlersMutex {};
    static inline std::deque<TShutdownHandler> mShutdownHandlers {};

-    static inline Version mVersion { 3, 9, 0 };
+    static inline Version mVersion { 3, 9, 1 };
 };

 void SplitString(std::string const& str, const char delim, std::vector<std::string>& out);
@@ -4,4 +4,4 @@ set -ex

 ./vcpkg/bootstrap-vcpkg.sh

-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON
@@ -4,4 +4,4 @@ set -ex

 ./vcpkg/bootstrap-vcpkg.sh

-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+apt-get update -y
+
+apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+git config --global --add safe.directory $(pwd)
+git config --global --add safe.directory $(pwd)/vcpkg
+git config --global --add safe.directory $(pwd)/deps/commandline
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+./vcpkg/bootstrap-vcpkg.sh
+
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server-tests
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server
+
+objcopy --only-keep-debug bin/BeamMP-Server bin/BeamMP-Server.debug
+objcopy --add-gnu-debuglink bin/BeamMP-Server bin/BeamMP-Server.debug
+
+strip -s bin/BeamMP-Server
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -ex
+
+apt-get update -y
+
+apt-get install -y liblua5.3-0 curl
+
@@ -4,4 +4,4 @@ set -ex

 ./vcpkg/bootstrap-vcpkg.sh

-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON
@@ -4,4 +4,4 @@ set -ex

 ./vcpkg/bootstrap-vcpkg.sh

-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON
@@ -670,7 +670,13 @@ void TNetwork::TCPClient(const std::weak_ptr<TClient>& c) {
            Client->Disconnect("TCPRcv failed");
            break;
        }
-        mServer.GlobalParser(c, std::move(res), mPPSMonitor, *this, false);
+        try {
+            mServer.GlobalParser(c, std::move(res), mPPSMonitor, *this, false);
+        } catch (const std::exception& e) {
+            beammp_warnf("Failed to receive/parse packet via TCP from client {}: {}", Client->GetID(), e.what());
+            Client->Disconnect("Failed to parse packet");
+            break;
+        }
    }

    if (QueueSync.joinable())
@@ -28,6 +28,7 @@
 #include <any>
 #include <optional>
 #include <sstream>
+#include <utility>

 #include <nlohmann/json.hpp>

@@ -53,7 +54,6 @@ static std::optional<std::pair<int, int>> GetPidVid(const std::string& str) {
    }
    return std::nullopt;
 }
-
 TEST_CASE("GetPidVid") {
    SUBCASE("Valid singledigit") {
        const auto MaybePidVid = GetPidVid("0-1");
@@ -120,7 +120,6 @@ TEST_CASE("GetPidVid") {
        CHECK(!MaybePidVid);
    }
 }
-
 TServer::TServer(const std::vector<std::string_view>& Arguments) {
    beammp_info("BeamMP Server v" + Application::ServerVersionString());
    Application::SetSubsystemStatus("Server", Application::Status::Starting);
@@ -472,7 +471,13 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
        }

        if (PID != -1 && VID != -1 && PID == c.GetID()) {
-            Data = Data.substr(Data.find('{'));
+            auto BracketPos = Data.find('{');
+            if (BracketPos == std::string::npos) {
+                beammp_debugf("Invalid 'Or' packet body from client {}", c.GetID());
+                return;
+            }
+
+            Data = Data.substr(BracketPos);
            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleReset", "", c.GetID(), VID, Data));
            Network.SendToAll(&c, StringToVector(Packet), false, true);
        }
@@ -501,7 +506,14 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
        }

        if (PID != -1 && VID != -1 && PID == c.GetID()) {
-            Data = Data.substr(Data.find('['));
+            auto BracketPos = Data.find('[');
+            if (BracketPos == std::string::npos) {
+                beammp_debugf("Invalid 'Op' packet body from client {}", c.GetID());
+                return;
+            }
+
+            Data = Data.substr(BracketPos);
+
            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehiclePaintChanged", "", c.GetID(), VID, Data));
            Network.SendToAll(&c, StringToVector(Packet), false, true);
Author	SHA1	Message	Date
Tixx	89392a67c2	Bump version to 3.9.1	2026-03-08 18:16:10 +01:00
Tixx	86a1c50c8b	Add dynamic export (#470 ) Testing builds with -Wl,--export-dynamic Closes #464 --- By creating this pull request, I understand that code that is AI generated or otherwise automatically generated may be rejected without further discussion. I declare that I fully understand all code I pushed into this PR, and wrote all this code myself and own the rights to this code.	2026-03-08 18:09:42 +01:00
Tixx	d97010c8ca	Harden malformed vehicle packet parsing (#475 ) ## Summary Reject malformed vehicle reset and paint packets before slicing structured payloads, and catch parser exceptions in the TCP client loop. ## Problem Or:<pid>-<vid>:null and similarly malformed Op packets could reach substr(npos) in ParseVehicle, throwing std::out_of_range. On TCP, that exception could escape the client loop and kill the thread. ## Changes - Guard Or reset packets when no { payload exists - Guard Op paint packets when no [ payload exists - Add a small helper and unit test for structured payload extraction - Catch std::exception around GlobalParser in the TCP client loop and disconnect the offending client ## Verification - git diff --check - Full build/tests not run in this shell because cmake was not installed	2026-03-08 17:29:55 +01:00
Tixx	8a613e0b16	Prevent log spam and simplify code	2026-03-08 17:24:30 +01:00
alex	48d721f602	Harden malformed vehicle packet parsing	2026-03-07 21:23:00 -07:00
0R3Z	da0089fb2e	add export-dynamic flag	2026-02-19 21:15:14 +01:00
Tixx	3befc84f00	Add build deb13 (#469 ) add/test Debian 13 build to github actions Closes #464 --- By creating this pull request, I understand that code that is AI generated or otherwise automatically generated may be rejected without further discussion. I declare that I fully understand all code I pushed into this PR, and wrote all this code myself and own the rights to this code.	2026-02-19 20:07:28 +01:00
0R3Z	48a77e9ea6	add debian 13 to release workflow	2026-02-02 12:52:42 +01:00
0R3Z	f9c85a1f35	fix release workflow formatting	2026-02-02 12:51:01 +01:00
0R3Z	168a410129	add build Debian 13 for ARM64	2026-01-25 18:11:33 +01:00
0R3Z	4926e1aebd	add support for Debian 13 on github workflows	2026-01-25 17:59:02 +01:00
0R3Z	1e2d8688a8	add installation scripts for Debian 13	2026-01-25 17:58:26 +01:00
Tixx	6f196aca64	Decrease likelyhood of lua stack corruption (#462 ) Decreases the likelyhood of lua stack corruption. --- By creating this pull request, I understand that code that is AI generated or otherwise automatically generated may be rejected without further discussion. I declare that I fully understand all code I pushed into this PR, and wrote all this code myself and own the rights to this code.	2026-01-18 21:56:31 +01:00