Changeset 93647 in vbox for trunk/src/VBox

Timestamp:

Feb 8, 2022 9:05:38 AM (3 years ago)

Author:

vboxsync

Message:

FE: bugref:9955: Added conversion from console codepage to UTF-8 in Windows during reading the password from console.

File:

• trunk/src/VBox/Frontends/Common/PasswordInput.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/Common/PasswordInput.cpp

@@ -23 +23 @@
 
 #include <iprt/ctype.h>
+#include <iprt/err.h>
 #include <iprt/message.h>
 #include <iprt/stream.h>
@@ -129 +130 @@
                 vrc = RTStrmGetLine(g_pStdIn, &aszPwdInput[0], sizeof(aszPwdInput));
                 if (RT_SUCCESS(vrc))
+                {
+#ifdef RT_OS_WINDOWS
+                    /*
+                     * Returned string encoded in console code page (e.g. Win-125X or CP-XXX).
+                     * Convert it to Utf-8
+                     */
+                    char *pszPassword = NULL;
+                    vrc = RTStrConsoleCPToUtf8(&pszPassword, aszPwdInput);
+                    if (RT_SUCCESS(vrc) && pszPassword)
+                    {
+                        *pPassword = pszPassword;
+                        RTMemFree(pszPassword);
+                    }
+                    else
+                        rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE,
+                                                "Failed to convert password from windows console codepage to Utf-8 (%Rrc)",
+                                                vrc);
+#else
                     *pPassword = aszPwdInput;
+#endif
+                }
                 else
                     rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed read password from command line (%Rrc)", vrc);