Fix for storing user name

Author: jet2jet

Common/unicode.cpp

@@ -556,9 +556,9 @@ BSTR __stdcall MyStringToBSTR(
 	CMyStringW& string)
 {
 #ifdef OLE2ANSI
-	return ::SysAllocStringLen(string, (UINT) string.GetLengthA());
+	return ::SysAllocStringLen(string.IsEmpty() ? "" : string, (UINT) string.GetLengthA());
 #else
-	return ::SysAllocStringLen(string, (UINT) string.GetLength());
+	return ::SysAllocStringLen(string.IsEmpty() ? L"" : string, (UINT)string.GetLength());
 #endif
 }
 

ShellDLL/Auth.cpp

@@ -189,6 +189,11 @@ AuthReturnType CAuthentication::SSHAuthenticate(IEasySFTPAuthentication2* pAuth,
 	::SysFreeString(bstr);
 	size_t nUserLen = 0;
 	auto* pUser = reinterpret_cast<LPCSTR>(strUserName.AllocUTF8String(&nUserLen));
+	if (!pUser)
+	{
+		pUser = "";
+		nUserLen = 0;
+	}
 	switch (mode)
 	{
 		case EasySFTPAuthenticationMode::None:
@@ -365,6 +370,11 @@ AuthReturnType CAuthentication::SSHAuthenticateWithAgent(IEasySFTPAuthentication
 {
 	size_t nUserLen = 0;
 	auto* lpszUser = reinterpret_cast<LPCSTR>(strUserName.AllocUTF8String(&nUserLen));
+	if (!lpszUser)
+	{
+		lpszUser = "";
+		nUserLen = 0;
+	}
 
 	CAuthSession* pAuthSession = NULL;
 	{

ShellDLL/AuthPage.cpp

@@ -228,6 +228,14 @@ LRESULT CHostAuthPage::OnApply(WPARAM wParam, LPARAM lParam)
 	}
 	if (bAutoLogin)
 	{
+		if (strUserName.IsEmpty())
+		{
+			_SecureStringW::SecureEmptyString(strPassword);
+			::MyMessageBoxW(m_hWnd, MAKEINTRESOURCEW(IDS_NO_USER_NAME), NULL, MB_ICONEXCLAMATION);
+			GetParentSheet()->SetCurSel(this);
+			return PSNRET_INVALID_NOCHANGEPAGE;
+		}
+
 		CMyStringW strPKey;
 		if (nAuthType == EasySFTPAuthenticationMode::PrivateKey)
 		{
@@ -303,6 +311,7 @@ LRESULT CHostAuthPage::OnApply(WPARAM wParam, LPARAM lParam)
 		else
 		{
 			m_pSettings->ClearCredentials();
+			m_pSettings->strUserName = strUserName;
 		}
 	}
 	else