diff options
| author | Kenny Root <kenny@the-b.org> | 2015-04-17 23:38:10 -0700 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-04-17 23:38:10 -0700 |
| commit | 6372acec6f745c9689ab1db703611f78e41bb0e0 (patch) | |
| tree | 21724ad48ce70ff61bd9ed1fd6e5fa6f6b1fd10b | |
| parent | 514a73bde9ec1c68d6e6ff65923fe05781676605 (diff) | |
| parent | 422b0131dbf0b7fbb37a3a1e0403389ad3b0808c (diff) | |
| download | connectbot-6372acec6f745c9689ab1db703611f78e41bb0e0.tar.gz connectbot-6372acec6f745c9689ab1db703611f78e41bb0e0.tar.bz2 connectbot-6372acec6f745c9689ab1db703611f78e41bb0e0.zip | |
Merge branch 'master' into gradle-conversion
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/src/main/java/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/app/src/main/java/org/connectbot/transport/Telnet.java b/app/src/main/java/org/connectbot/transport/Telnet.java index 5fde2f6..16cbd0e 100644 --- a/app/src/main/java/org/connectbot/transport/Telnet.java +++ b/app/src/main/java/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)); } |