diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-09-08 22:31:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-08 22:31:52 +0200 |
| commit | 24e1039eb6fe32115e8d1a62a84965e9be19a2ed (patch) | |
| tree | 22f899bc08c7f672a457d8ca1c7b848bbe7d7e98 /modules/mono/utils | |
| parent | e9f49a6d5ac88a6afca8a16f91a05f4fcdf5a589 (diff) | |
| parent | 3dcd7e54f49ee379c7e71726888452cb2c38b178 (diff) | |
Merge pull request #32045 from neikeq/fix-cannot-create-mono-log-file
Mono: Fix unable to create log file due to str_format bug
Diffstat (limited to 'modules/mono/utils')
| -rw-r--r-- | modules/mono/utils/string_utils.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/modules/mono/utils/string_utils.cpp b/modules/mono/utils/string_utils.cpp index ae5a2cde81..716c712ccc 100644 --- a/modules/mono/utils/string_utils.cpp +++ b/modules/mono/utils/string_utils.cpp @@ -208,14 +208,18 @@ String str_format(const char *p_format, ...) { #endif #if defined(MINGW_ENABLED) || defined(_MSC_VER) && _MSC_VER < 1900 -#define vsnprintf(m_buffer, m_count, m_format, m_argptr) vsnprintf_s(m_buffer, m_count, _TRUNCATE, m_format, m_argptr) +#define gd_vsnprintf(m_buffer, m_count, m_format, m_args_copy) vsnprintf_s(m_buffer, m_count, _TRUNCATE, m_format, m_args_copy) +#define gd_vscprintf(m_format, m_args_copy) _vscprintf(m_format, m_args_copy) +#else +#define gd_vsnprintf(m_buffer, m_count, m_format, m_args_copy) vsnprintf(m_buffer, m_count, m_format, m_args_copy) +#define gd_vscprintf(m_format, m_args_copy) vsnprintf(NULL, 0, p_format, m_args_copy) #endif String str_format(const char *p_format, va_list p_list) { va_list list; va_copy(list, p_list); - int len = vsnprintf(NULL, 0, p_format, list); + int len = gd_vscprintf(p_format, list); va_end(list); len += 1; // for the trailing '/0' @@ -223,7 +227,7 @@ String str_format(const char *p_format, va_list p_list) { char *buffer(memnew_arr(char, len)); va_copy(list, p_list); - vsnprintf(buffer, len, p_format, list); + gd_vsnprintf(buffer, len, p_format, list); va_end(list); String res(buffer); |