Merge remote-tracking branch 'upstream/master' into next

patrikjuvonen · patrikjuvonen · commit 01847e04971c · 2022-12-24T16:19:14.000+02:00
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 ## Multi Theft Auto: San Andreas
 
-[![Build Status](https://github.com/multitheftauto/mtasa-blue/workflows/Build/badge.svg?event=push&branch=master)](https://github.com/multitheftauto/mtasa-blue/actions?query=branch%3Amaster+event%3Apush) [![Unique servers online](https://img.shields.io/endpoint?url=https%3A%2F%2Fmtasa.com%2Fapi%2Fservers-shields.io.json)](https://community.multitheftauto.com/index.php?p=servers) [![Unique players online](https://img.shields.io/endpoint?url=https%3A%2F%2Fmtasa.com%2Fapi%2Fplayers-shields.io.json)](https://multitheftauto.com) [![Unique players last 24 hours](https://img.shields.io/endpoint?url=https%3A%2F%2Fmtasa.com%2Fapi%2Funique-players-shields.io.json)](https://multitheftauto.com) [![Discord](https://img.shields.io/discord/278474088903606273?label=discord&logo=discord)](https://discord.com/invite/mtasa) [![Crowdin](https://badges.crowdin.net/e/f5dba7b9aa6594139af737c85d81d3aa/localized.svg)](https://multitheftauto.crowdin.com/multitheftauto)
+[![Build Status](https://github.com/multitheftauto/mtasa-blue/workflows/Build/badge.svg?event=push&branch=master)](https://github.com/multitheftauto/mtasa-blue/actions?query=branch%3Amaster+event%3Apush) [![Unique servers online](https://img.shields.io/endpoint?url=https%3A%2F%2Fmultitheftauto.com%2Fapi%2Fservers-shields.io.json)](https://community.multitheftauto.com/index.php?p=servers) [![Unique players online](https://img.shields.io/endpoint?url=https%3A%2F%2Fmultitheftauto.com%2Fapi%2Fplayers-shields.io.json)](https://multitheftauto.com) [![Unique players last 24 hours](https://img.shields.io/endpoint?url=https%3A%2F%2Fmultitheftauto.com%2Fapi%2Funique-players-shields.io.json)](https://multitheftauto.com) [![Discord](https://img.shields.io/discord/278474088903606273?label=discord&logo=discord)](https://discord.com/invite/mtasa) [![Crowdin](https://badges.crowdin.net/e/f5dba7b9aa6594139af737c85d81d3aa/localized.svg)](https://multitheftauto.crowdin.com/multitheftauto)
 
 [Multi Theft Auto](https://www.multitheftauto.com/) (MTA) is a software project that adds network play functionality to Rockstar North's Grand Theft Auto game series, in which this functionality is not originally found. It is a unique modification that incorporates an extendable network play element into a proprietary commercial single-player PC game.
 
@@ -27,13 +27,15 @@ Using a framework based on resources has a number of advantages. It allows conte
 Our project's code repository can be found on the [multitheftauto/mtasa-blue](https://github.com/multitheftauto/mtasa-blue/) Git repository at [GitHub](https://github.com/). We are always looking for new developers, so if you're interested, here are some useful links:
 
 * [Coding guidelines](https://github.com/multitheftauto/mtasa-blue/blob/master/CONTRIBUTING.md#contributors-guide)
-* [Nightly Builds](https://nightly.mtasa.com/)
+* [Nightly Builds](https://nightly.multitheftauto.com/)
 * [Milestones](https://github.com/multitheftauto/mtasa-blue/milestones)
 
 ### IDE Setup
-If not using Visual Studio 2017, download and install the [EditorConfig](https://visualstudiogallery.msdn.microsoft.com/c8bccfe2-650c-4b42-bc5c-845e21f96328) plugin to automatically set up your IDE for the correct formatting.
+
+If not using Visual Studio 2017, download and install the [EditorConfig](https://marketplace.visualstudio.com/items?itemName=EditorConfigTeam.EditorConfig) plugin to automatically set up your IDE for the correct formatting.
 
 ### Build Instructions
+
 #### Windows
 
 Prerequisites
@@ -98,30 +100,31 @@ $ docker pull ghcr.io/multitheftauto/mtasa-blue-build:latest
 ```
 
 | Architecture | Docker image tag | Required build-time CLI-arguments |
-| ------------ | ---------------- | ------------------------------- |
-| x86          | latest           | `-e BUILD_ARCHITECTURE=x86`     |
-| x86_64       | latest           |                                 |
-| arm          | armhf            |                                 |
-| arm64        | arm64            |                                 |
-
+| ------------ | ---------------- | --------------------------------- |
+| x86          | latest           | `-e BUILD_ARCHITECTURE=x86`       |
+| x86_64       | latest           |                                   |
+| arm          | armhf            |                                   |
+| arm64        | arm64            |                                   |
 
 **Building with Docker**
 
 These examples assume that your current directory is the mtasa-blue checkout directory. You should also know that `/build` is the code directory required by our Docker images inside the container. If the current directory is not a valid git repository, it instead create a (shallow) clone of the mtasa-blue repository. After compiling, you will find the resulting binaries in `./Bin`. To build the unoptimised debug build, add `-e BUILD_CONFIG=debug` to the docker run arguments.
 
-| Architecture | Build command                                                                                |
-| ------------ | -------------------------------------------------------------------------------------------- |
+| Architecture | Build command                                                                                                    |
+| ------------ | ---------------------------------------------------------------------------------------------------------------- |
 | x86          | ``` docker run --rm -v `pwd`:/build -e BUILD_ARCHITECTURE=x86 ghcr.io/multitheftauto/mtasa-blue-build:latest ``` |
 | x86_64       | ``` docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:latest ```                           |
 | arm          | ``` docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:armhf ```                            |
 | arm64        | ``` docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:arm64 ```                            |
 
 ### Premake FAQ
+
 #### How to add new C++ source files?
-Execute `win-create-projects.bat`.
+
+Execute `win-create-projects.bat`
 
 ## License
 
-Unless otherwise specified, all source code hosted on this repository is licensed under the GPLv3 license. See the LICENSE file for more details.
+Unless otherwise specified, all source code hosted on this repository is licensed under the GPLv3 license. See the [LICENSE](./LICENSE) file for more details.
 
 Grand Theft Auto and all related trademarks are © Rockstar North 1997–2022.
diff --git a/Server/mods/deathmatch/logic/CResource.cpp b/Server/mods/deathmatch/logic/CResource.cpp
@@ -2369,24 +2369,49 @@ ResponseCode CResource::HandleRequest(HttpRequest* ipoHttpRequest, HttpResponse*
     return HTTPRESPONSECODE_200_OK;
 }
 
-void Unescape(std::string& str)
+std::string Unescape(std::string_view sv)
 {
-    const char* pPercent = strchr(str.c_str(), '%');
+    // Converts a character to a hexadecimal value
+    auto toHex = [](char c)
+    {
+        if (c >= '0' && c <= '9')
+            return c - '0';
+        if (c >= 'a' && c <= 'f')
+            return c - 'a' + 10;
+        if (c >= 'A' && c <= 'F')
+            return c - 'A' + 10;
+        return 0;
+    };
 
-    while (pPercent)
+    std::string out;
+    // String can only shrink here
+    // as %?? is collapsed to a single char
+    out.reserve(sv.length());
+    auto it = sv.begin();
+    while (it != sv.end())
     {
-        if (pPercent[1] && pPercent[2])
+        if (*it == '%')
         {
-            int iCharCode = 0;
-            sscanf(&pPercent[1], "%02X", &iCharCode);
-            str.replace(pPercent - str.c_str(), 3, (char*)&iCharCode);
-            pPercent = strchr(pPercent + 3, '%');
+            // Avoid reading past the end
+            if (std::distance(it, sv.end()) < 3)
+            {
+                out.push_back(*it++);
+                continue;
+            }
+            // Skip %
+            ++it;
+            // Read two digits/letters and convert to char
+            uint8_t digit1 = toHex(*it++);
+            uint8_t digit2 = toHex(*it++);
+            out.push_back(static_cast<char>(digit1 * 0x10 + digit2));
         }
         else
         {
-            break;
+            // Push normally
+            out.push_back(*it++);
         }
     }
+    return out;
 }
 
 ResponseCode CResource::HandleRequestCall(HttpRequest* ipoHttpRequest, HttpResponse* ipoHttpResponse, CAccount* pAccount)
@@ -2447,7 +2472,7 @@ ResponseCode CResource::HandleRequestCall(HttpRequest* ipoHttpRequest, HttpRespo
                 if (iKey >= 0 && iKey < MAX_INPUT_VARIABLES)
                 {
                     std::string strValue(pEqual + 1, pAnd - (pEqual + 1));
-                    Unescape(strValue);
+                    strValue = Unescape(strValue);
 
                     if (iKey + 1 > static_cast<int>(vecArguments.size()))
                         vecArguments.resize(iKey + 1);
@@ -2463,7 +2488,7 @@ ResponseCode CResource::HandleRequestCall(HttpRequest* ipoHttpRequest, HttpRespo
         }
     }
 
-    Unescape(strFuncName);
+    strFuncName = Unescape(strFuncName);
 
     for (CExportedFunction& Exported : m_ExportedFunctions)
     {
@@ -2673,6 +2698,7 @@ ResponseCode CResource::HandleRequestActive(HttpRequest* ipoHttpRequest, HttpRes
     }
 
     Unescape(strFile);
+    strFile = Unescape(strFile);
 
     for (CResourceFile* pResourceFile : m_ResourceFiles)
     {
@@ -2705,7 +2731,7 @@ ResponseCode CResource::HandleRequestActive(HttpRequest* ipoHttpRequest, HttpRes
                 }
                 else
                 {
-                    SString err("Resource %s is not running.", m_strResourceName.c_str());
+                    SString err = "That resource is not running.";
                     ipoHttpResponse->SetBody(err.c_str(), err.size());
                     return HTTPRESPONSECODE_401_UNAUTHORIZED;
                 }
@@ -2751,7 +2777,7 @@ ResponseCode CResource::HandleRequestActive(HttpRequest* ipoHttpRequest, HttpRes
         }
     }
 
-    SString err("Cannot find a resource file named '%s' in the resource %s.", strFile.c_str(), m_strResourceName.c_str());
+    SString err = "That resource file could not be found in that resource.";
     ipoHttpResponse->SetBody(err.c_str(), err.size());
     return HTTPRESPONSECODE_404_NOTFOUND;
 }

Original file line number	Diff line number	Diff line change
`@@ -2369,24 +2369,49 @@ ResponseCode CResource::HandleRequest(HttpRequest* ipoHttpRequest, HttpResponse*`
`2369`	`2369`	`return HTTPRESPONSECODE_200_OK;`
`2370`	`2370`	`}`
`2371`	`2371`
`2372`		`-void Unescape(std::string& str)`
	`2372`	`+std::string Unescape(std::string_view sv)`
`2373`	`2373`	`{`
`2374`		`- const char* pPercent = strchr(str.c_str(), '%');`
	`2374`	`+ // Converts a character to a hexadecimal value`
	`2375`	`+ auto toHex = [](char c)`
	`2376`	`+ {`
	`2377`	`+ if (c >= '0' && c <= '9')`
	`2378`	`+ return c - '0';`
	`2379`	`+ if (c >= 'a' && c <= 'f')`
	`2380`	`+ return c - 'a' + 10;`
	`2381`	`+ if (c >= 'A' && c <= 'F')`
	`2382`	`+ return c - 'A' + 10;`
	`2383`	`+ return 0;`
	`2384`	`+ };`
`2375`	`2385`
`2376`		`- while (pPercent)`
	`2386`	`+ std::string out;`
	`2387`	`+ // String can only shrink here`
	`2388`	`+ // as %?? is collapsed to a single char`
	`2389`	`+ out.reserve(sv.length());`
	`2390`	`+ auto it = sv.begin();`
	`2391`	`+ while (it != sv.end())`
`2377`	`2392`	`{`
`2378`		`- if (pPercent[1] && pPercent[2])`
	`2393`	`+ if (*it == '%')`
`2379`	`2394`	`{`
`2380`		`- int iCharCode = 0;`
`2381`		`- sscanf(&pPercent[1], "%02X", &iCharCode);`
`2382`		`- str.replace(pPercent - str.c_str(), 3, (char*)&iCharCode);`
`2383`		`- pPercent = strchr(pPercent + 3, '%');`
	`2395`	`+ // Avoid reading past the end`
	`2396`	`+ if (std::distance(it, sv.end()) < 3)`
	`2397`	`+ {`
	`2398`	`+ out.push_back(*it++);`
	`2399`	`+ continue;`
	`2400`	`+ }`
	`2401`	`+ // Skip %`
	`2402`	`+ ++it;`
	`2403`	`+ // Read two digits/letters and convert to char`
	`2404`	`+ uint8_t digit1 = toHex(*it++);`
	`2405`	`+ uint8_t digit2 = toHex(*it++);`
	`2406`	`+ out.push_back(static_cast<char>(digit1 * 0x10 + digit2));`
`2384`	`2407`	`}`
`2385`	`2408`	`else`
`2386`	`2409`	`{`
`2387`		`- break;`
	`2410`	`+ // Push normally`
	`2411`	`+ out.push_back(*it++);`
`2388`	`2412`	`}`
`2389`	`2413`	`}`
	`2414`	`+ return out;`
`2390`	`2415`	`}`
`2391`	`2416`
`2392`	`2417`	`ResponseCode CResource::HandleRequestCall(HttpRequest* ipoHttpRequest, HttpResponse* ipoHttpResponse, CAccount* pAccount)`
`@@ -2447,7 +2472,7 @@ ResponseCode CResource::HandleRequestCall(HttpRequest* ipoHttpRequest, HttpRespo`
`2447`	`2472`	`if (iKey >= 0 && iKey < MAX_INPUT_VARIABLES)`
`2448`	`2473`	`{`
`2449`	`2474`	`std::string strValue(pEqual + 1, pAnd - (pEqual + 1));`
`2450`		`- Unescape(strValue);`
	`2475`	`+ strValue = Unescape(strValue);`
`2451`	`2476`
`2452`	`2477`	`if (iKey + 1 > static_cast<int>(vecArguments.size()))`
`2453`	`2478`	`vecArguments.resize(iKey + 1);`
`@@ -2463,7 +2488,7 @@ ResponseCode CResource::HandleRequestCall(HttpRequest* ipoHttpRequest, HttpRespo`
`2463`	`2488`	`}`
`2464`	`2489`	`}`
`2465`	`2490`
`2466`		`- Unescape(strFuncName);`
	`2491`	`+ strFuncName = Unescape(strFuncName);`
`2467`	`2492`
`2468`	`2493`	`for (CExportedFunction& Exported : m_ExportedFunctions)`
`2469`	`2494`	`{`
`@@ -2673,6 +2698,7 @@ ResponseCode CResource::HandleRequestActive(HttpRequest* ipoHttpRequest, HttpRes`
`2673`	`2698`	`}`
`2674`	`2699`
`2675`	`2700`	`Unescape(strFile);`
	`2701`	`+ strFile = Unescape(strFile);`
`2676`	`2702`
`2677`	`2703`	`for (CResourceFile* pResourceFile : m_ResourceFiles)`
`2678`	`2704`	`{`
`@@ -2705,7 +2731,7 @@ ResponseCode CResource::HandleRequestActive(HttpRequest* ipoHttpRequest, HttpRes`
`2705`	`2731`	`}`
`2706`	`2732`	`else`
`2707`	`2733`	`{`
`2708`		`- SString err("Resource %s is not running.", m_strResourceName.c_str());`
	`2734`	`+ SString err = "That resource is not running.";`
`2709`	`2735`	`ipoHttpResponse->SetBody(err.c_str(), err.size());`
`2710`	`2736`	`return HTTPRESPONSECODE_401_UNAUTHORIZED;`
`2711`	`2737`	`}`
`@@ -2751,7 +2777,7 @@ ResponseCode CResource::HandleRequestActive(HttpRequest* ipoHttpRequest, HttpRes`
`2751`	`2777`	`}`
`2752`	`2778`	`}`
`2753`	`2779`
`2754`		`- SString err("Cannot find a resource file named '%s' in the resource %s.", strFile.c_str(), m_strResourceName.c_str());`
	`2780`	`+ SString err = "That resource file could not be found in that resource.";`
`2755`	`2781`	`ipoHttpResponse->SetBody(err.c_str(), err.size());`
`2756`	`2782`	`return HTTPRESPONSECODE_404_NOTFOUND;`
`2757`	`2783`	`}`