nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-16 10:37:38 -05:00
Code Issues Projects Releases Wiki Activity

xfer_{up,down}load_gotpkt free their input sftp_packet as a side

Browse Source 
effect of handling it, but they do not free it if it isn't a packet
they recognise as part of their upload/download. Invent a return value
that specifically signals this, and consistently free pktin at every
call site if that return value comes back. Also, ensure that that
return value also always comes with something meaningful in fxp_error.

[originally from svn r9915]
This commit is contained in:
Simon Tatham
2013-07-11 17:24:53 +00:00
parent d9ccf044be
commit c925526e3f
3 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pscp.c
View File

@ -928,6 +928,8 @@ int scp_send_filedata(char *data, int len)
ret = xfer_upload_gotpkt(scp_sftp_xfer, pktin);
if (ret <= 0) {
tell_user(stderr, "error while writing: %s", fxp_error());
if (ret == INT_MIN) /* pktin not even freed */
sfree(pktin);
errs++;
return 1;
}
@ -969,6 +971,8 @@ int scp_send_finish(void)
ret = xfer_upload_gotpkt(scp_sftp_xfer, pktin);
if (ret <= 0) {
tell_user(stderr, "error while writing: %s", fxp_error());
if (ret == INT_MIN) /* pktin not even freed */
sfree(pktin);
errs++;
return 1;
}
@ -1566,6 +1570,8 @@ int scp_recv_filedata(char *data, int len)
ret = xfer_download_gotpkt(scp_sftp_xfer, pktin);
if (ret <= 0) {
tell_user(stderr, "pscp: error while reading: %s", fxp_error());
if (ret == INT_MIN) /* pktin not even freed */
sfree(pktin);
errs++;
return -1;
}
@ -1611,6 +1617,8 @@ int scp_finish_filerecv(void)
ret = xfer_download_gotpkt(scp_sftp_xfer, pktin);
if (ret <= 0) {
tell_user(stderr, "pscp: error while reading: %s", fxp_error());
if (ret == INT_MIN) /* pktin not even freed */
sfree(pktin);
errs++;
return -1;
}