From: rubenwardy <rw@rubenwardy.com>
Date: Tue, 26 Mar 2019 01:18:52 +0000 (+0000)
Subject: Prevent multi-line chat messages server-side (#8420)
X-Git-Tag: 5.1.0~263
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d0a1a29ab36196a73d5454f8de368ddbf8f957e4;p=oweals%2Fminetest.git

Prevent multi-line chat messages server-side (#8420)
---

diff --git a/src/server.cpp b/src/server.cpp
index 003ad45b4..172bb4744 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2874,8 +2874,13 @@ std::wstring Server::handleChat(const std::string &name, const std::wstring &wna
 				L"It was refused. Send a shorter message";
 	}
 
+	auto message = trim(wide_to_utf8(wmessage));
+	if (message.find_first_of("\n\r") != std::wstring::npos) {
+		return L"New lines are not permitted in chat messages";
+	}
+
 	// Run script hook, exit if script ate the chat message
-	if (m_script->on_chat_message(name, wide_to_utf8(wmessage)))
+	if (m_script->on_chat_message(name, message))
 		return L"";
 
 	// Line to send