Merge pull request ddnet#9567 from gerdoe-jr/patch-7

Learath2 · web-flow · commit 82d8112888d3 · 2025-01-27T11:36:22.000Z
Escape only route part of custom map download URL
diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
@@ -2734,8 +2734,10 @@ int CServer::LoadMap(const char *pMapName)
 
 	if(Config()->m_SvMapsBaseUrl[0])
 	{
-		str_format(aBuf, sizeof(aBuf), "%s%s_%s.map", Config()->m_SvMapsBaseUrl, pMapName, aSha256);
-		EscapeUrl(m_aMapDownloadUrl, aBuf);
+		char aEscaped[256];
+		str_format(aBuf, sizeof(aBuf), "%s_%s.map", pMapName, aSha256);
+		EscapeUrl(aEscaped, aBuf);
+		str_format(m_aMapDownloadUrl, sizeof(m_aMapDownloadUrl), "%s%s", Config()->m_SvMapsBaseUrl, aEscaped);
 	}
 	else
 	{

Original file line number	Diff line number	Diff line change
`@@ -2734,8 +2734,10 @@ int CServer::LoadMap(const char *pMapName)`
`2734`	`2734`
`2735`	`2735`	`if(Config()->m_SvMapsBaseUrl[0])`
`2736`	`2736`	`{`
`2737`		`- str_format(aBuf, sizeof(aBuf), "%s%s_%s.map", Config()->m_SvMapsBaseUrl, pMapName, aSha256);`
`2738`		`- EscapeUrl(m_aMapDownloadUrl, aBuf);`
	`2737`	`+ char aEscaped[256];`
	`2738`	`+ str_format(aBuf, sizeof(aBuf), "%s_%s.map", pMapName, aSha256);`
	`2739`	`+ EscapeUrl(aEscaped, aBuf);`
	`2740`	`+ str_format(m_aMapDownloadUrl, sizeof(m_aMapDownloadUrl), "%s%s", Config()->m_SvMapsBaseUrl, aEscaped);`
`2739`	`2741`	`}`
`2740`	`2742`	`else`
`2741`	`2743`	`{`