X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/df0870fc8ceb5a8fea66a4d0fe00e7db12317e33..63be776775f6859bc185f2fbc00da5d16710fde7:/psftp.c diff --git a/psftp.c b/psftp.c index c1d4950b..c7cd8701 100644 --- a/psftp.c +++ b/psftp.c @@ -472,6 +472,8 @@ int sftp_general_get(struct sftp_command *cmd, int restart) ret = 0; xfer_set_error(xfer); } + + sfree(vbuf); } } @@ -1637,14 +1639,13 @@ int from_backend(void *frontend, int is_stderr, const char *data, int datalen) unsigned char *p = (unsigned char *) data; unsigned len = (unsigned) datalen; - assert(len > 0); - /* * stderr data is just spouted to local stderr and otherwise * ignored. */ if (is_stderr) { - fwrite(data, 1, len, stderr); + if (len > 0) + fwrite(data, 1, len, stderr); return 0; } @@ -1654,7 +1655,7 @@ int from_backend(void *frontend, int is_stderr, const char *data, int datalen) if (!outptr) return 0; - if (outlen > 0) { + if ((outlen > 0) && (len > 0)) { unsigned used = outlen; if (used > len) used = len;