portfwd[] array. (Not sure what would happen in this case, mind.)
Also modify -L/-R/-D code to cope with IPv4/IPv6 tunnels in saved settings.
git-svn-id: http://svn.tartarus.org/sgt/putty@5440
cda61777-01e9-0310-a592-
d414129be87e
dynamic = !strcmp(p, "-D");
fwd = value;
ptr = cfg->portfwd;
dynamic = !strcmp(p, "-D");
fwd = value;
ptr = cfg->portfwd;
- /* if multiple forwards, find end of list */
- if (ptr[0]=='R' || ptr[0]=='L' || ptr[0] == 'D') {
- for (i = 0; i < sizeof(cfg->portfwd) - 2; i++)
- if (ptr[i]=='\000' && ptr[i+1]=='\000')
- break;
- ptr = ptr + i + 1; /* point to next forward slot */
+ /* if existing forwards, find end of list */
+ while (*ptr) {
+ while (*ptr)
+ ptr++;
+ ptr++;
+ i = ptr - cfg->portfwd;
ptr[0] = p[1]; /* insert a 'L', 'R' or 'D' at the start */
ptr[0] = p[1]; /* insert a 'L', 'R' or 'D' at the start */
- if (strlen(fwd) > sizeof(cfg->portfwd) - i - 2) {
+ ptr++;
+ if (1 + strlen(fwd) + 2 > sizeof(cfg->portfwd) - i) {
cmdline_error("out of space for port forwardings");
return ret;
}
cmdline_error("out of space for port forwardings");
return ret;
}
- strncpy(ptr+1, fwd, sizeof(cfg->portfwd) - i);
+ strncpy(ptr, fwd, sizeof(cfg->portfwd) - i - 2);
if (!dynamic) {
/*
* We expect _at least_ two colons in this string. The
if (!dynamic) {
/*
* We expect _at least_ two colons in this string. The
}
cfg->portfwd[sizeof(cfg->portfwd) - 1] = '\0';
cfg->portfwd[sizeof(cfg->portfwd) - 2] = '\0';
}
cfg->portfwd[sizeof(cfg->portfwd) - 1] = '\0';
cfg->portfwd[sizeof(cfg->portfwd) - 2] = '\0';
- ptr[strlen(ptr)+1] = '\000'; /* append two '\000' */
+ ptr[strlen(ptr)+1] = '\000'; /* append 2nd '\000' */
}
if (!strcmp(p, "-m")) {
char *filename, *command;
}
if (!strcmp(p, "-m")) {
char *filename, *command;