sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into enet_wip_nothing_to_see_here

This commit is contained in:
Lynix 2017-02-10 15:22:33 +01:00
parent 26945bb10e ab6e9d3b86
commit 6d5d1ac1cb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Nazara/Core/String.cpp
View File

@ -5102,10 +5102,14 @@ namespace Nz
*/ */
String String::FormatVA(const char* format, va_list args) String String::FormatVA(const char* format, va_list args)
{ {
// Copy va_list to use it twice
va_list args2;
va_copy(args2, args);
std::size_t length = std::vsnprintf(nullptr, 0, format, args); std::size_t length = std::vsnprintf(nullptr, 0, format, args);
auto str = std::make_shared<SharedString>(length); auto str = std::make_shared<SharedString>(length);
std::vsnprintf(str->string.get(), length + 1, format, args); std::vsnprintf(str->string.get(), length + 1, format, args2);
return String(std::move(str)); return String(std::move(str));
} }