3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

string_printf Wformat-security hack #

Browse Source 
#3594, #3592
This commit is contained in:
tamasmeszaros 2020-02-03 11:06:49 +01:00
parent e50825ce05
commit 8aec5f6726
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libslic3r/libslic3r.h
View File

@ -231,16 +231,17 @@ static inline bool is_approx(Number value, Number test_value)
} }
template<class...Args> template<class...Args>
std::string string_printf(const char *const fmt, Args &&...args) std::string string_printf(const char *const _fmt, Args &&...args)
{ {
static const size_t INITIAL_LEN = 1024; static const size_t INITIAL_LEN = 1024;
std::vector<char> buffer(INITIAL_LEN, '\0'); std::vector<char> buffer(INITIAL_LEN, '\0');
int bufflen = snprintf(buffer.data(), INITIAL_LEN - 1, fmt, std::forward<Args>(args)...); auto fmt = std::string("%s") + _fmt;
int bufflen = snprintf(buffer.data(), INITIAL_LEN - 1, fmt.c_str(), "", std::forward<Args>(args)...);
if (bufflen >= int(INITIAL_LEN)) { if (bufflen >= int(INITIAL_LEN)) {
buffer.resize(size_t(bufflen) + 1); buffer.resize(size_t(bufflen) + 1);
snprintf(buffer.data(), buffer.size(), fmt, std::forward<Args>(args)...); snprintf(buffer.data(), buffer.size(), fmt.c_str(), "", std::forward<Args>(args)...);
} }
return std::string(buffer.begin(), buffer.begin() + bufflen); return std::string(buffer.begin(), buffer.begin() + bufflen);