fix for handling of wchars on windows in getting the directory name [blocks: #4678] #4688
Conversation
BrettSchiff
requested review from
kroening,
peterschrammel,
pkesseli,
smowton and
tautschnig
as code owners
src/util/file_util.cpp
Outdated
| DWORD retval=GetCurrentDirectory(4096, buffer); | ||
| if(retval == 0) | ||
| throw system_exceptiont("failed to get current directory of process"); | ||
| std::string working_directory(buffer); | ||
| std::wstring unicode_buffer(buffer); | ||
| std::string working_directory(unicode_buffer.begin(), unicode_buffer.end()); |
There was a problem hiding this comment.
I'd suggest to use std::string working_directory(narrow(buffer)); with an additional #include "unicode.h".
| @@ -61,11 +61,12 @@ std::string get_current_working_directory() | |||
| std::string working_directory=wd; | |||
| free(wd); | |||
| #else | |||
| char buffer[4096]; | |||
| wchar_t buffer[4096]; | |||
| DWORD retval=GetCurrentDirectory(4096, buffer); | |||
There was a problem hiding this comment.
Just checking: was Visual Studio now happy with 4096 or did it still complain about a buffer overrun?
There was a problem hiding this comment.
It is happy with 4096, I imagine it's number of character rather than size in bytes
src/util/file_util.cpp
Outdated
| @@ -61,11 +61,12 @@ std::string get_current_working_directory() | |||
| std::string working_directory=wd; | |||
| free(wd); | |||
| #else | |||
| char buffer[4096]; | |||
| wchar_t buffer[4096]; | |||
There was a problem hiding this comment.
This depends on whether you compile with -DUNICODE or not. Since this ever got committed / builds in CI in this state, it looks like some builds do not define UNICODE. TCHAR buffer[4096] will give a Unicode-agnostic buffer of either 8- or 16-bit chars as per configuration, and similarly some sort of #ifdef UNICODE should be used to guard the use of wstring below.
There was a problem hiding this comment.
Oh, thank you, that explains why building via Visual Studio/msbuild yields different results than via make.
There was a problem hiding this comment.
Alternatively of course we could assert that no right-minded person would ever build without -DUNICODE any longer and do this everywhere.
There was a problem hiding this comment.
There was a problem hiding this comment.
Ah, that is very useful, thank you!
tautschnig
changed the title
BrettSchiff
force-pushed
the
directory_wchar_fix
branch
from
83d835c to
7ff0c4c
Compare
tautschnig
force-pushed
the
directory_wchar_fix
branch
from
7ff0c4c to
1aa166f
Compare
tautschnig
force-pushed
the
directory_wchar_fix
branch
from
1aa166f to
bbbc714
Compare
directory names needed to be fetched using wchar instead of char