nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-09 23:33:46 -05:00
Code Issues Projects Releases Wiki Activity

handle_{got,sent}data: separate length and error params.

Browse Source 
Now we pass an error code in a separate dedicated parameter, instead
of overloading the length parameter so that a negative value means an
error code. This enables length to become unsigned without causing
trouble.
This commit is contained in:
Simon Tatham
2019-02-06 20:36:11 +00:00
parent a742abae27
commit f60fe670ad
5 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
windows/winhsock.c
View File

@ -45,11 +45,11 @@ typedef struct HandleSocket {
Socket sock;
} HandleSocket;
static int handle_gotdata(struct handle *h, const void *data, int len)
static int handle_gotdata(struct handle *h, const void *data, int len, int err)
{
HandleSocket *hs = (HandleSocket *)handle_get_privdata(h);
if (len < 0) {
if (err) {
plug_closing(hs->plug, "Read error from handle", 0, 0);
return 0;
} else if (len == 0) {
@ -79,25 +79,22 @@ static int handle_gotdata(struct handle *h, const void *data, int len)
}
}
static int handle_stderr(struct handle *h, const void *data, int len)
static int handle_stderr(struct handle *h, const void *data, int len, int err)
{
HandleSocket *hs = (HandleSocket *)handle_get_privdata(h);
if (len > 0)
if (!err && len > 0)
log_proxy_stderr(hs->plug, &hs->stderrdata, data, len);
return 0;
}
static void handle_sentdata(struct handle *h, int new_backlog)
static void handle_sentdata(struct handle *h, int new_backlog, int err)
{
HandleSocket *hs = (HandleSocket *)handle_get_privdata(h);
if (new_backlog < 0) {
/* Special case: this is actually reporting an error writing
* to the underlying handle, and our input value is the error
* code itself, negated. */
plug_closing(hs->plug, win_strerror(-new_backlog), -new_backlog, 0);
if (err) {
plug_closing(hs->plug, win_strerror(err), err, 0);
return;
}