From 41ff465810a9da24b00513e92f5aac8f1e0d5ae0 Mon Sep 17 00:00:00 2001 From: simon Date: Sun, 25 Nov 2001 12:23:34 +0000 Subject: [PATCH] Oops - fix another segfault in that -L and -R code git-svn-id: svn://svn.tartarus.org/sgt/putty@1412 cda61777-01e9-0310-a592-d414129be87e --- plink.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plink.c b/plink.c index fc420ef9..c60902b5 100644 --- a/plink.c +++ b/plink.c @@ -447,7 +447,7 @@ int main(int argc, char **argv) strncpy(cfg.username, username, sizeof(cfg.username)); cfg.username[sizeof(cfg.username) - 1] = '\0'; } else if ((!strcmp(p, "-L") || !strcmp(p, "-R")) && argc > 1) { - char *fwd, *ptr; + char *fwd, *ptr, *q; int i=0; --argc, fwd = *++argv; ptr = extra_portfwd; @@ -460,7 +460,8 @@ int main(int argc, char **argv) } ptr[0] = p[1]; /* insert a 'L' or 'R' at the start */ strncpy(ptr+1, fwd, sizeof(extra_portfwd) - i); - ptr[strcspn(ptr, ":")] = '\t'; /* replace first : with \t */ + q = strchr(ptr, ':'); + if (q) *q = '\t'; /* replace first : with \t */ ptr[strlen(ptr)+1] = '\000'; /* append two '\000' */ extra_portfwd[sizeof(extra_portfwd) - 1] = '\0'; } else if (!strcmp(p, "-m") && argc > 1) { -- 2.11.0