diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-23 23:26:53 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-23 23:26:53 +0200 |
| commit | 2e0adb33e03e3142f1412ed570415c5ce616dcef (patch) | |
| tree | ed555cce68a22a878bb233885d1ba3cf5a52194c | |
| parent | 26287ff521b55de188c7b41eee4bff389844c6c3 (diff) | |
| parent | 03418d6378fe72bea2ff4b941792054dd208b65d (diff) | |
| download | vcxsrv-2e0adb33e03e3142f1412ed570415c5ce616dcef.tar.gz vcxsrv-2e0adb33e03e3142f1412ed570415c5ce616dcef.tar.bz2 vcxsrv-2e0adb33e03e3142f1412ed570415c5ce616dcef.zip | |
Merge remote-tracking branch 'origin/released'
| -rw-r--r-- | tools/plink/sshshare.c | 2 | ||||
| -rw-r--r-- | tools/plink/winshare.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/plink/sshshare.c b/tools/plink/sshshare.c index bd4602b5b..bf2a64c29 100644 --- a/tools/plink/sshshare.c +++ b/tools/plink/sshshare.c @@ -1763,7 +1763,7 @@ static int share_receive(Plug plug, int urgent, char *data, int len) crGetChar(c); if (c == '\012') break; - if (cs->recvlen > sizeof(cs->recvbuf)) { + if (cs->recvlen >= sizeof(cs->recvbuf)) { char *buf = dupprintf("Version string far too long\n"); share_disconnect(cs, buf); sfree(buf); diff --git a/tools/plink/winshare.c b/tools/plink/winshare.c index 17bad46d9..89c1cc325 100644 --- a/tools/plink/winshare.c +++ b/tools/plink/winshare.c @@ -5,6 +5,8 @@ #include <stdio.h> #include <assert.h> +#if !defined NO_SECURITY + #define DEFINE_PLUG_METHOD_MACROS #include "tree234.h" #include "putty.h" @@ -12,8 +14,6 @@ #include "proxy.h" #include "ssh.h" -#if !defined NO_SECURITY - #include "winsecur.h" #define CONNSHARE_PIPE_PREFIX "\\\\.\\pipe\\putty-connshare" |