godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #32045 from neikeq/fix-cannot-create-mono-log-file 

Mono: Fix unable to create log file due to str_format bug
This commit is contained in:
Rémi Verschelde 2019-09-08 22:31:52 +02:00 committed by GitHub
parent e9f49a6d5a 3dcd7e54f4
commit 24e1039eb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mono/mono_gd/gd_mono_log.cpp
View File

@ -159,7 +159,7 @@ void GDMonoLog::initialize() {
log_file = FileAccess::open(log_file_path, FileAccess::WRITE); log_file = FileAccess::open(log_file_path, FileAccess::WRITE);
if (!log_file) { if (!log_file) {
ERR_PRINT("Mono: Cannot create log file."); ERR_PRINTS("Mono: Cannot create log file at: " + log_file_path);
} }
} }

10
modules/mono/utils/string_utils.cpp
View File

@ -208,14 +208,18 @@ String str_format(const char *p_format, ...) {
#endif #endif
#if defined(MINGW_ENABLED) || defined(_MSC_VER) && _MSC_VER < 1900 #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 #endif
String str_format(const char *p_format, va_list p_list) { String str_format(const char *p_format, va_list p_list) {
va_list list; va_list list;
va_copy(list, p_list); va_copy(list, p_list);
int len = vsnprintf(NULL, 0, p_format, list); int len = gd_vscprintf(p_format, list);
va_end(list); va_end(list);
len += 1; // for the trailing '/0' 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)); char *buffer(memnew_arr(char, len));
va_copy(list, p_list); va_copy(list, p_list);
vsnprintf(buffer, len, p_format, list); gd_vsnprintf(buffer, len, p_format, list);
va_end(list); va_end(list);
String res(buffer); String res(buffer);