GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-15 18:15:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix double quotes escape (#1397 #1435 #1946 #1990) (#2002)

Browse Source
This commit is contained in:
Noisyfox 2023-09-05 20:18:43 +08:00 committed by GitHub
parent 7a0e0179c7
commit 4011a0d748
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libslic3r/Config.cpp
View File

@ -43,7 +43,7 @@ namespace Slic3r {
//static const std::string CONFIG_INHERITS_KEY = "inherits"; //static const std::string CONFIG_INHERITS_KEY = "inherits";
//static const std::string CONFIG_INSTANT_KEY = "instantiation"; //static const std::string CONFIG_INSTANT_KEY = "instantiation";
// Escape \n, \r and backslash // Escape double quotes, \n, \r and backslash
std::string escape_string_cstyle(const std::string &str) std::string escape_string_cstyle(const std::string &str)
{ {
// Allocate a buffer twice the input string length, // Allocate a buffer twice the input string length,
@ -58,9 +58,9 @@ std::string escape_string_cstyle(const std::string &str)
} else if (c == '\n') { } else if (c == '\n') {
(*outptr ++) = '\\'; (*outptr ++) = '\\';
(*outptr ++) = 'n'; (*outptr ++) = 'n';
} else if (c == '\\') { } else if (c == '\\' || c == '"') {
(*outptr ++) = '\\'; (*outptr++) = '\\';
(*outptr ++) = '\\'; (*outptr++) = c;
} else } else
(*outptr ++) = c; (*outptr ++) = c;
} }
@ -117,7 +117,7 @@ std::string escape_strings_cstyle(const std::vector<std::string> &strs)
return std::string(out.data(), outptr - out.data()); return std::string(out.data(), outptr - out.data());
} }
// Unescape \n, \r and backslash // Unescape double quotes, \n, \r and backslash
bool unescape_string_cstyle(const std::string &str, std::string &str_out) bool unescape_string_cstyle(const std::string &str, std::string &str_out)
{ {
std::vector<char> out(str.size(), 0); std::vector<char> out(str.size(), 0);