From f55e11e7331ea1c2e1aa3e2bcbc312b31f38facc Mon Sep 17 00:00:00 2001 From: Jyrki Vesterinen Date: Sat, 22 Sep 2018 12:27:30 +0300 Subject: [PATCH] Fix #3567: error when trying to send an error message to the client Simple_wml requires double quotes to be duplicated like this. (cherry-picked from commit 9536f3825e867d30b7adc71d6b53bd2230c31cab) --- src/campaign_server/campaign_server.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/campaign_server/campaign_server.cpp b/src/campaign_server/campaign_server.cpp index 2371af693f0..a7d1276c006 100644 --- a/src/campaign_server/campaign_server.cpp +++ b/src/campaign_server/campaign_server.cpp @@ -805,7 +805,8 @@ void server::handle_upload(const server::request& req) LOG_CS << "Upload aborted - invalid file names in add-on data (" << badnames.size() << " entries).\n"; send_error( "Add-on rejected: The add-on contains files or directories with illegal names. " - "File or directory names may not contain whitespace, control characters or any of the following characters: '\" * / : < > ? \\ | ~'. " + // Note: the double double quote will be flattened to a single double quote. + "File or directory names may not contain whitespace, control characters or any of the following characters: '\"\" * / : < > ? \\ | ~'. " "It also may not contain '..' end with '.' or be longer than 255 characters.", filelist, req.sock); } else if(!check_case_insensitive_duplicates(data, &badnames)) {