maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use std::string instead of C99 dynamic array

Browse source
This commit is contained in:
Andrew Schwartzmeyer 2015-07-22 16:29:17 -07:00
parent 9426e9c455
commit 0592a37395
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
impl/getusername.cpp
View file

@ -43,8 +43,8 @@ BOOL GetUserName(WCHAR_T *lpBuffer, LPDWORD lpnSize)
} }
// Get username from system in a thread-safe manner // Get username from system in a thread-safe manner
char userName[LOGIN_NAME_MAX]; std::string username(LOGIN_NAME_MAX, '\0');
int err = getlogin_r(userName, LOGIN_NAME_MAX); int err = getlogin_r(&username[0], username.size());
// Map errno to Win32 Error Codes // Map errno to Win32 Error Codes
if (err != 0) { if (err != 0) {
switch (errno) { switch (errno) {
@ -73,10 +73,17 @@ BOOL GetUserName(WCHAR_T *lpBuffer, LPDWORD lpnSize)
return 0; return 0;
} }
// "Trim" the username to the first trailing null because
// otherwise the std::string with repeated null characters is
// valid, and the conversion will still include all the null
// characters. Creating a std::string from the C string of the
// original effectively trims it to the first null, without
// the need to manually trim whitespace (nor using Boost).
username = std::string(username.c_str());
// Convert to char * to WCHAR_T * (UTF-8 to UTF-16 LE w/o BOM) // Convert to char * to WCHAR_T * (UTF-8 to UTF-16 LE w/o BOM)
std::string input(userName);
std::vector<unsigned char> output; std::vector<unsigned char> output;
SCXCoreLib::Utf8ToUtf16le(input, output); SCXCoreLib::Utf8ToUtf16le(username, output);
if (output.size()/2 + 1 > *lpnSize) { if (output.size()/2 + 1 > *lpnSize) {
errno = ERROR_INSUFFICIENT_BUFFER; errno = ERROR_INSUFFICIENT_BUFFER;