nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Code Issues Projects Releases Wiki Activity

Handle failed SSH_FXP_CLOSE requests in sftp_put_file.

Browse Source 
It is possible for SSH_FXP_CLOSE requests to fail. This can happen if the
server buffers writes and an error occurs flushing the data to disk while
processing the SSH_FXP_CLOSE request. If the close fails, sftp_put_file now
returns an error as well.
This commit is contained in:
Tim Kosse 2016-12-28 15:34:53 +01:00 committed by Simon Tatham
parent e9a76883ad
commit 6f871e3d22
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
psftp.c
View File

@ -712,7 +712,13 @@ int sftp_put_file(char *fname, char *outfname, int recurse, int restart)
cleanup: cleanup:
req = fxp_close_send(fh); req = fxp_close_send(fh);
pktin = sftp_wait_for_reply(req); pktin = sftp_wait_for_reply(req);
fxp_close_recv(pktin, req); ret = fxp_close_recv(pktin, req);
if (!ret) {
if (!err) {
printf("error while closing: %s", fxp_error());
err = 1;
}
}
close_rfile(file); close_rfile(file);

3
sftp.c
View File

@ -658,11 +658,12 @@ struct sftp_request *fxp_close_send(struct fxp_handle *handle)
return req; return req;
} }
void fxp_close_recv(struct sftp_packet *pktin, struct sftp_request *req) int fxp_close_recv(struct sftp_packet *pktin, struct sftp_request *req)
{ {
sfree(req); sfree(req);
fxp_got_status(pktin); fxp_got_status(pktin);
sftp_pkt_free(pktin); sftp_pkt_free(pktin);
return fxp_errtype == SSH_FX_OK;
} }
struct sftp_request *fxp_mkdir_send(const char *path) struct sftp_request *fxp_mkdir_send(const char *path)

4
sftp.h
View File

@ -149,10 +149,10 @@ struct fxp_handle *fxp_opendir_recv(struct sftp_packet *pktin,
struct sftp_request *req); struct sftp_request *req);
/* /*
* Close a file/dir. * Close a file/dir. Returns 1 on success, 0 on error.
*/ */
struct sftp_request *fxp_close_send(struct fxp_handle *handle); struct sftp_request *fxp_close_send(struct fxp_handle *handle);
void fxp_close_recv(struct sftp_packet *pktin, struct sftp_request *req); int fxp_close_recv(struct sftp_packet *pktin, struct sftp_request *req);
/* /*
* Make a directory. * Make a directory.