Add error reporting to get_console_input_win32().
PATCH 1/1 Add error reporting to get_console_input_win32().
When the function setup fails due to invalid file handles, or because WriteFile(err, ...) fails (due to file handle corruption elsewhere), the function used to silently "return false"
Change this to print a M_WARN|M_ERRNO message.
Also, change the function style to early-return style (= large diff, but most are indent changes only).
--- src/openvpn/console_builtin.c | 96 ++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 46 deletions(-)
src/openvpn/console_builtin.c +50 -46
@@ -75,66 +75,70 @@ get_console_input_win32(const char *prompt, const bool echo, char *input, const in =GetStdHandle (STD_INPUT_HANDLE ); err =get_orig_stderr (); -if (in !=INVALID_HANDLE_VALUE - && err !=INVALID_HANDLE_VALUE - && !win32_service_interrupt (&win32_signal) - &&WriteFile (err, prompt,strlen (prompt), &len,NULL )) +if (in ==INVALID_HANDLE_VALUE + || err ==INVALID_HANDLE_VALUE + ||win32_service_interrupt (&win32_signal) + || !WriteFile (err, prompt,strlen (prompt), &len,NULL )) { -bool is_console = (GetFileType (in) ==FILE_TYPE_CHAR ); -DWORD flags_save =0 ; -int status =0 ; -WCHAR *winput; +msg (M_WARN |M_ERRNO ,"get_console_input_win32(): unexpected error" ); +return false; + } -if (is_console) - { -if (GetConsoleMode (in, &flags_save)) - { -DWORD flags =ENABLE_LINE_INPUT |ENABLE_PROCESSED_INPUT ; -if (echo) - { - flags |=ENABLE_ECHO_INPUT ; - } -SetConsoleMode (in, flags); - } -else - { - is_console =0 ; - } - } +bool is_console = (GetFileType (in) ==FILE_TYPE_CHAR ); +DWORD flags_save =0 ; +int status =0 ; +WCHAR *winput; -if (is_console) +if (is_console) + { +if (GetConsoleMode (in, &flags_save)) { - winput =malloc (capacity *sizeof (WCHAR )); -if (winput ==NULL ) +DWORD flags =ENABLE_LINE_INPUT |ENABLE_PROCESSED_INPUT ; +if (echo) { -return false; + flags |=ENABLE_ECHO_INPUT ; } - - status =ReadConsoleW (in, winput, capacity, &len,NULL ); -WideCharToMultiByte (CP_UTF8 ,0 , winput, len, input, capacity,NULL ,NULL ); -free (winput); +SetConsoleMode (in, flags); }else { - status =ReadFile (in, input, capacity, &len,NULL ); + is_console =0 ; } + } -string_null_terminate (input, (int )len, capacity); -chomp (input); - -if (!echo) - { -WriteFile (err,"\r\n" ,2 , &len,NULL ); - } -if (is_console) - { -SetConsoleMode (in, flags_save); - } -if (status && !win32_service_interrupt (&win32_signal)) +if (is_console) + { + winput =malloc (capacity *sizeof (WCHAR )); +if (winput ==NULL ) { -return true; +return false; } + + status =ReadConsoleW (in, winput, capacity, &len,NULL ); +WideCharToMultiByte (CP_UTF8 ,0 , winput, len, input, capacity,NULL ,NULL ); +free (winput); + } +else + { + status =ReadFile (in, input, capacity, &len,NULL ); + } + +string_null_terminate (input, (int )len, capacity); +chomp (input); + +if (!echo) + { +WriteFile (err,"\r\n" ,2 , &len,NULL ); + } +if (is_console) + { +SetConsoleMode (in, flags_save); } +if (status && !win32_service_interrupt (&win32_signal)) + { +return true; + } +}return false; }
Signature · 1 line
2.26.3
PATCH v2 1/1 Add error reporting to get_console_input_win32().
When the function setup fails due to invalid file handles, or because WriteFile(err, ...) fails (due to file handle corruption elsewhere), the function used to silently "return false"
Change this to print a M_WARN|M_ERRNO message.
Also, change the function style to early-return style (= large diff, but most are indent changes only).
v2: fix spurious "}" that was left over from change to early-return.
--- src/openvpn/console_builtin.c | 95 ++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 46 deletions(-)
src/openvpn/console_builtin.c +49 -46
@@ -75,65 +75,68 @@ get_console_input_win32(const char *prompt, const bool echo, char *input, const in =GetStdHandle (STD_INPUT_HANDLE ); err =get_orig_stderr (); -if (in !=INVALID_HANDLE_VALUE - && err !=INVALID_HANDLE_VALUE - && !win32_service_interrupt (&win32_signal) - &&WriteFile (err, prompt,strlen (prompt), &len,NULL )) +if (in ==INVALID_HANDLE_VALUE + || err ==INVALID_HANDLE_VALUE + ||win32_service_interrupt (&win32_signal) + || !WriteFile (err, prompt,strlen (prompt), &len,NULL )) { -bool is_console = (GetFileType (in) ==FILE_TYPE_CHAR ); -DWORD flags_save =0 ; -int status =0 ; -WCHAR *winput; +msg (M_WARN |M_ERRNO ,"get_console_input_win32(): unexpected error" ); +return false; + } -if (is_console) - { -if (GetConsoleMode (in, &flags_save)) - { -DWORD flags =ENABLE_LINE_INPUT |ENABLE_PROCESSED_INPUT ; -if (echo) - { - flags |=ENABLE_ECHO_INPUT ; - } -SetConsoleMode (in, flags); - } -else - { - is_console =0 ; - } - } +bool is_console = (GetFileType (in) ==FILE_TYPE_CHAR ); +DWORD flags_save =0 ; +int status =0 ; +WCHAR *winput; -if (is_console) +if (is_console) + { +if (GetConsoleMode (in, &flags_save)) { - winput =malloc (capacity *sizeof (WCHAR )); -if (winput ==NULL ) +DWORD flags =ENABLE_LINE_INPUT |ENABLE_PROCESSED_INPUT ; +if (echo) { -return false; + flags |=ENABLE_ECHO_INPUT ; } - - status =ReadConsoleW (in, winput, capacity, &len,NULL ); -WideCharToMultiByte (CP_UTF8 ,0 , winput, len, input, capacity,NULL ,NULL ); -free (winput); +SetConsoleMode (in, flags); }else { - status =ReadFile (in, input, capacity, &len,NULL ); + is_console =0 ; } + } -string_null_terminate (input, (int )len, capacity); -chomp (input); - -if (!echo) - { -WriteFile (err,"\r\n" ,2 , &len,NULL ); - } -if (is_console) - { -SetConsoleMode (in, flags_save); - } -if (status && !win32_service_interrupt (&win32_signal)) +if (is_console) + { + winput =malloc (capacity *sizeof (WCHAR )); +if (winput ==NULL ) { -return true; +return false; } + + status =ReadConsoleW (in, winput, capacity, &len,NULL ); +WideCharToMultiByte (CP_UTF8 ,0 , winput, len, input, capacity,NULL ,NULL ); +free (winput); + } +else + { + status =ReadFile (in, input, capacity, &len,NULL ); + } + +string_null_terminate (input, (int )len, capacity); +chomp (input); + +if (!echo) + { +WriteFile (err,"\r\n" ,2 , &len,NULL ); + } +if (is_console) + { +SetConsoleMode (in, flags_save); + } +if (status && !win32_service_interrupt (&win32_signal)) + { +return true; }return false;
Signature · 1 line
2.26.3
Tested with MSVC. It is now easier to diagnose problems:
2021-06-20 23:57:28 us=812000 get_console_input_win32(): unexpected error: No such device or address (errno=6) 2021-06-20 23:57:28 us=812000 ERROR: Failed retrieving username or password 2021-06-20 23:57:28 us=812000 Exiting due to fatal error
which are to be fixed.
Your patch has been applied to the master and release/2.5 branch (bugfix).
commit 8f283648d90799683d9e8f58ca4776ae1e893fd8 (master) commit b6012d80a198b5d7e8c2f399b92a1299c660a326 (release/2.5)
Author: Gert Doering Date: Fri Jun 18 20:12:46 2021 +0200
Add error reporting to get_console_input_win32().
Signed-off-by: Gert Doering <[email protected]...>
Acked-by: Lev Stipakov <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg22577.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering