mirrors/FreeRDP
0
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2024-11-26 19:33:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[utils,passphrase] NULL checks

Browse Source
This commit is contained in:
akallabeth 2024-11-11 17:03:58 +01:00
parent 7f27e168b3
commit 08839a11de
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libfreerdp/utils/passphrase.c
View File

@ -132,7 +132,6 @@ static const char* freerdp_passphrase_read_tty(rdpContext* context, const char*
{
BOOL terminal_needs_reset = FALSE;
char term_name[L_ctermid] = { 0 };
int term_file = 0;
FILE* fout = NULL;
@ -144,15 +143,29 @@ static const char* freerdp_passphrase_read_tty(rdpContext* context, const char*
ctermid(term_name);
int terminal_fildes = 0;
if (from_stdin || strcmp(term_name, "") == 0 || (term_file = open(term_name, O_RDWR)) == -1)
if (from_stdin || (strcmp(term_name, "") == 0))
{
fout = stdout;
terminal_fildes = STDIN_FILENO;
}
else
{
fout = fdopen(term_file, "w");
terminal_fildes = term_file;
const int term_file = open(term_name, O_RDWR);
if (term_file < 0)
{
fout = stdout;
terminal_fildes = STDIN_FILENO;
}
else
{
fout = fdopen(term_file, "w");
if (!fout)
{
close(term_file);
return NULL;
}
terminal_fildes = term_file;
}
}
struct termios orig_flags = { 0 };