- markus@cvs.openbsd.org 2001/04/11 10:59:01

     [ssh.c]
     use strtol() for ports, thanks jakob@

diff --git a/ChangeLog b/ChangeLog
index c5206cb97f3d2ec41c132948649c956efa1b37a6..210cf25e72e7f687fbb7dd7fb4c2a7ef8e465dde 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
    - djm@cvs.openbsd.org 2001/04/11 07:06:22
      [sftp-int.c]
      'mget' and 'mput' aliases; ok markus@
+   - markus@cvs.openbsd.org 2001/04/11 10:59:01
+     [ssh.c]
+     use strtol() for ports, thanks jakob@
 
 20010410
  - OpenBSD CVS Sync

diff --git a/ssh.c b/ssh.c
index 75094a106d7422fe457aec5bb004f7176188f33d..89ced97e28d85c00051a90f0544958e1f4d40af5 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.108 2001/04/07 08:55:18 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.109 2001/04/11 10:59:01 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -243,7 +243,7 @@ main(int ac, char **av)
 {
        int i, opt, optind, exit_status, ok;
        u_short fwd_port, fwd_host_port;
-       char *optarg, *cp, buf[256];
+       char *optarg, *cp, *endofnumber, buf[256];
        struct stat st;
        struct passwd *pw;
        int dummy;
@@ -456,7 +456,11 @@ main(int ac, char **av)
                        }
                        break;
                case 'p':
-                       options.port = atoi(optarg);
+                       options.port = strtol(optarg, &endofnumber, 0);
+                       if (optarg == endofnumber) {
+                               fprintf(stderr, "Bad port '%s'\n", optarg);
+                               exit(1);
+                       }
                        break;
                case 'l':
                        options.user = optarg;
@@ -485,7 +489,11 @@ main(int ac, char **av)
                        break;
 
                case 'D':
-                       fwd_port = atoi(optarg);
+                       fwd_port = strtol(optarg, &endofnumber, 0);
+                       if (optarg == endofnumber) {
+                               fprintf(stderr, "Bad port '%s'\n", optarg);
+                               exit(1);
+                       }
                        add_local_forward(&options, fwd_port, "socks4", 0);
                        break;