PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-02-10 15:44:41 -05:00
Code Releases Activity

Use g_ascii_string_to_signed instead of atoi in ssh, allows error

Browse source 
checking.
This commit is contained in:
Dave Davenport 2019-03-29 13:50:48 +01:00
parent fadfae5433
commit 7d117886b5
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/dialogs/ssh.c
View file

@ -206,8 +206,17 @@ static SshEntry *read_known_hosts_file ( const char *path, SshEntry * retv, unsi
start++; start++;
char *end = strchr ( start, ']'); char *end = strchr ( start, ']');
if ( end[1] == '\x1F' ){ if ( end[1] == '\x1F' ){
GError *error = NULL;
*end = '\0'; *end = '\0';
port = atoi ( &(end[2]) ); gint64 number = 0;
if ( g_ascii_string_to_signed ( &(end[2]), 10, 0, 65536, &number, &error) ) {
// Safe, as we indicated limits.
port = number;
} else {
g_warning ( "Failed to parse port number: %s: %s",
&(end[2]), error?(error->message):"Not a number" );
g_error_free ( error );
}
} }
} }
// Is this host name already in the list? // Is this host name already in the list?
@ -459,8 +468,16 @@ static SshEntry * get_ssh ( SSHModePrivateData *pd, unsigned int *length )
int port = 0; int port = 0;
char *portstr = strchr ( h[i], '\x1F' ); char *portstr = strchr ( h[i], '\x1F' );
if ( portstr != NULL ) { if ( portstr != NULL ) {
GError *error = NULL;
*portstr = '\0'; *portstr = '\0';
port = atoi ( &(portstr[1]) ); gint64 number = 0;
if ( g_ascii_string_to_signed ( &(portstr[1]), 10, 0, 65536, &number, &error) ) {
port = number;
} else {
g_warning ( "Failed to parse port number: %s: %s",
&(portstr[1]), error?(error->message):"Not a number" );
g_error_free ( error );
}
} }
retv[i].hostname = h[i]; retv[i].hostname = h[i];
retv[i].port = port; retv[i].port = port;