Fixed the port-parsing in an rsync:// path; e.g., this now

works properly:  rsync://backup@otherbox/module/a:123:b

diff --git a/options.c b/options.c
index 4331fc6..a404a8d 100644 (file)
--- a/options.c
+++ b/options.c
@@ -1981,7 +1981,7 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
                        if (p[1] == ':')
                                *port_ptr = atoi(p+2);
                } else {
                        if (p[1] == ':')
                                *port_ptr = atoi(p+2);
                } else {

-                       if ((p = strchr(s, ':')) != NULL) {
+                       if ((p = strchr(s, ':')) != NULL && p < s + hostlen) {

                                hostlen = p - s;
                                *port_ptr = atoi(p+1);
                        }
                                hostlen = p - s;
                                *port_ptr = atoi(p+1);
                        }