summaryrefslogtreecommitdiffstats
path: root/connect.c
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2008-12-21 02:12:11 +0100
committerJunio C Hamano <gitster@pobox.com>2008-12-21 10:48:23 +0100
commit8f1482536ad680fcd738158e76e254a534f2e690 (patch)
tree2b3b49ebe6e1c9a894b80250c9efcc04c47df5ff /connect.c
parentAdd a documentat on how to revert a faulty merge (diff)
downloadgit-8f1482536ad680fcd738158e76e254a534f2e690.tar.xz
git-8f1482536ad680fcd738158e76e254a534f2e690.zip
connect.c: stricter port validation, silence compiler warning
In addition to checking if the provided port is numeric, also check that the string isn't empty and that the port number is within the valid range. Incidentally, this silences a compiler warning about ignoring strtol's return value. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'connect.c')
-rw-r--r--connect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/connect.c b/connect.c
index 584e04c217..2f55ad2c25 100644
--- a/connect.c
+++ b/connect.c
@@ -480,8 +480,8 @@ char *get_port(char *host)
char *p = strchr(host, ':');
if (p) {
- strtol(p+1, &end, 10);
- if (*end == '\0') {
+ long port = strtol(p + 1, &end, 10);
+ if (end != p + 1 && *end == '\0' && 0 <= port && port < 65536) {
*p = '\0';
return p+1;
}