From f67f8573e03a0fde41b923fed15fb84855dc3d74 Mon Sep 17 00:00:00 2001 From: Tixx <83774803+WiserTixx@users.noreply.github.com> Date: Thu, 7 Nov 2024 21:36:38 +0100 Subject: [PATCH 1/2] Log zlib error messages --- src/Compressor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Compressor.cpp b/src/Compressor.cpp index 806d1e4..142720b 100644 --- a/src/Compressor.cpp +++ b/src/Compressor.cpp @@ -25,7 +25,7 @@ std::vector Comp(std::span input) { reinterpret_cast(input.data()), static_cast(input.size())); if (res != Z_OK) { - error("zlib compress() failed: " + std::to_string(res)); + error("zlib compress() failed (code: " + std::to_string(res) + ", message: " + zError(res) + ")"); throw std::runtime_error("zlib compress() failed"); } debug("zlib compressed " + std::to_string(input.size()) + " B to " + std::to_string(output_size) + " B"); @@ -52,7 +52,7 @@ std::vector DeComp(std::span input) { output_buffer.resize(output_buffer.size() * 2); output_size = output_buffer.size(); } else if (res != Z_OK) { - error("zlib uncompress() failed: " + std::to_string(res)); + error("zlib uncompress() failed (code: " + std::to_string(res) + ", message: " + zError(res) + ")"); throw std::runtime_error("zlib uncompress() failed"); } else if (res == Z_OK) { break; From d58ff960ece10e9b85140f92073074af91deed5a Mon Sep 17 00:00:00 2001 From: Tixx <83774803+WiserTixx@users.noreply.github.com> Date: Thu, 7 Nov 2024 21:39:18 +0100 Subject: [PATCH 2/2] Fix github regex --- src/Network/Core.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Network/Core.cpp b/src/Network/Core.cpp index 6202c37..203aadf 100644 --- a/src/Network/Core.cpp +++ b/src/Network/Core.cpp @@ -104,7 +104,7 @@ void CoreSend(std::string data) { } bool IsAllowedLink(const std::string& Link) { - std::regex link_pattern(R"(https:\/\/(?:\w+)?(?:\.)?(?:beammp\.com|beammp\.gg|github.com\/BeamMP\/|discord\.gg|patreon\.com\/BeamMP))"); + std::regex link_pattern(R"(https:\/\/(?:\w+)?(?:\.)?(?:beammp\.com|beammp\.gg|github\.com\/BeamMP\/|discord\.gg|patreon\.com\/BeamMP))"); std::smatch link_match; return std::regex_search(Link, link_match, link_pattern) && link_match.position() == 0; }