From 422b0131dbf0b7fbb37a3a1e0403389ad3b0808c Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 17 Apr 2015 23:34:24 -0700 Subject: Telnet: ensure port number is below maximum Closes #62 --- CHANGELOG.md | 1 + src/org/connectbot/transport/Telnet.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9032374..6822d91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). as a negative integer. - DSA host key support was broken from the beginning of the v1.8 series. - Connections would sometimes close when leaving ConnectBot. +- Telnet port range too high will no longer cause crashes. ### Added - More context is given for failures to connect via SSH which should diff --git a/src/org/connectbot/transport/Telnet.java b/src/org/connectbot/transport/Telnet.java index 5fde2f6..16cbd0e 100644 --- a/src/org/connectbot/transport/Telnet.java +++ b/src/org/connectbot/transport/Telnet.java @@ -287,7 +287,7 @@ public class Telnet extends AbsTransport { host.setHostname(uri.getHost()); int port = uri.getPort(); - if (port < 0) + if (port < 0 || port > 65535) port = DEFAULT_PORT; host.setPort(port); @@ -309,7 +309,7 @@ public class Telnet extends AbsTransport { selection.put(HostDatabase.FIELD_HOST_HOSTNAME, uri.getHost()); int port = uri.getPort(); - if (port < 0) + if (port < 0 || port > 65535) port = DEFAULT_PORT; selection.put(HostDatabase.FIELD_HOST_PORT, Integer.toString(port)); } -- cgit v1.2.3