From 109bc23d53f66b2d11ec2ea2ef8878b11a4c2d2f Mon Sep 17 00:00:00 2001
From: Dave Davenport <qball@gmpclient.org>
Date: Sat, 20 Apr 2019 10:46:44 +0200
Subject: [Dialogs.SSH] Remove use of g_ascii_string_to_signed.

---
 source/dialogs/ssh.c   | 39 ++++++++++++++++++++++-----------------
 subprojects/libgwater  |  2 +-
 subprojects/libnkutils |  2 +-
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/source/dialogs/ssh.c b/source/dialogs/ssh.c
index e19fc3db..6d66ed7c 100644
--- a/source/dialogs/ssh.c
+++ b/source/dialogs/ssh.c
@@ -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;
diff --git a/subprojects/libgwater b/subprojects/libgwater
index c7bd8c91..e6faf482 160000
--- a/subprojects/libgwater
+++ b/subprojects/libgwater
@@ -1 +1 @@
-Subproject commit c7bd8c914999d12051466a2d1b94f7ef74fbbffb
+Subproject commit e6faf48267ae40547cb86c125f265f54f382df1c
diff --git a/subprojects/libnkutils b/subprojects/libnkutils
index 6164baca..b2e7f844 160000
--- a/subprojects/libnkutils
+++ b/subprojects/libnkutils
@@ -1 +1 @@
-Subproject commit 6164bacaef10031ce77380499cfad2ae818ab6b0
+Subproject commit b2e7f8444c0a092708ee5f09f5ac206aa9330b78
-- 
cgit v1.2.3