PolytreeDE
/
rofi
mirror of https://github.com/davatorium/rofi.git
1
0
Fork 0
Code Releases Activity

[Dialogs.SSH] Remove use of g_ascii_string_to_signed.

This commit is contained in:
Dave Davenport 2019-04-20 10:46:44 +02:00
parent c33543f5ca
commit 109bc23d53
3 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
source/dialogs/ssh.c
View File

@ -205,17 +205,19 @@ static SshEntry *read_known_hosts_file ( const char *path, SshEntry * retv, unsi
if ( start[0] == '[' ) {
start++;
char *end = strchr ( start, ']');
if ( end[1] == '\x1F' ){
GError *error = NULL;
if ( end[1] == ':' ){
*end = '\0';
gint64 number = 0;
if ( g_ascii_string_to_signed ( &(end[2]), 10, 0, 65536, &number, &error) ) {
// Safe, as we indicated limits.
port = number;
errno = 0;
gchar *endptr = NULL;
gint64 number = g_ascii_strtoll ( &(end[2]), &endptr, 10);
if ( errno != 0 ) {
g_warning ( "Failed to parse port number: %s.", &(end[2]) );
} else if ( endptr == &(end[2])) {
g_warning ( "Failed to parse port number: %s, invalid number.", &(end[2]) );
} else if ( number < 0 || number > 65535 ) {
g_warning ( "Failed to parse port number: %s, out of range.", &(end[2]) );
} else {
g_warning ( "Failed to parse port number: %s: %s",
&(end[2]), error?(error->message):"Not a number" );
g_error_free ( error );
port = number;
}
}
}
@ -468,16 +470,19 @@ static SshEntry * get_ssh ( SSHModePrivateData *pd, unsigned int *length )
int port = 0;
char *portstr = strchr ( h[i], '\x1F' );
if ( portstr != NULL ) {
GError *error = NULL;
*portstr = '\0';
gint64 number = 0;
if ( g_ascii_string_to_signed ( &(portstr[1]), 10, 0, 65536, &number, &error) ) {
port = number;
errno = 0;
gchar *endptr= NULL;
gint64 number = g_ascii_strtoll ( &(portstr[1]), &endptr, 10);
if ( errno != 0 ) {
g_warning ( "Failed to parse port number: %s.", &(portstr[1]) );
} else if ( endptr == &(portstr[1])) {
g_warning ( "Failed to parse port number: %s, invalid number.", &(portstr[1]) );
} else if ( number < 0 || number > 65535 ) {
g_warning ( "Failed to parse port number: %s, out of range.", &(portstr[1]) );
} else {
g_warning ( "Failed to parse port number: %s: %s",
&(portstr[1]), error?(error->message):"Not a number" );
g_error_free ( error );
}
port = number;
}
}
retv[i].hostname = h[i];
retv[i].port = port;

2
subprojects/libgwater

@ -1 +1 @@
Subproject commit c7bd8c914999d12051466a2d1b94f7ef74fbbffb
Subproject commit e6faf48267ae40547cb86c125f265f54f382df1c

2
subprojects/libnkutils

@ -1 +1 @@
Subproject commit 6164bacaef10031ce77380499cfad2ae818ab6b0
Subproject commit b2e7f8444c0a092708ee5f09f5ac206aa9330b78