generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed a bug whereby a received file whose length was a multiple of

Browse Source 
512 bytes could have random garbage appended.  Also, stop processing TFTP
packets which are too short to be legal.
This commit is contained in:
Dan Fandrich
2006-03-20 22:15:22 +00:00
parent 1282aad4a5
commit a63f9887b9
1 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lib/tftp.c
View File

@@ -656,30 +656,40 @@ CURLcode Curl_tftp(struct connectdata *conn, bool *done)
state->remote_addrlen = fromlen; state->remote_addrlen = fromlen;
} }
/* The event is given by the TFTP packet time */ /* Sanity check packet length */
event = (tftp_event_t)ntohs(state->rpacket.event); if (state->rbytes < 4)
{
failf(conn->data, "Received too short packet\n");
/* Not a timeout, but how best to handle it? */
event = TFTP_EVENT_TIMEOUT;
} else {
/* The event is given by the TFTP packet time */
event = (tftp_event_t)ntohs(state->rpacket.event);
switch(event) {
case TFTP_EVENT_DATA:
if (state->rbytes > 4)
Curl_client_write(data, CLIENTWRITE_BODY,
(char *)state->rpacket.u.data.data, state->rbytes-4);
break;
case TFTP_EVENT_ERROR:
state->error = (tftp_error_t)ntohs(state->rpacket.u.error.code);
infof(conn->data, "%s\n", (char *)state->rpacket.u.error.data);
break;
case TFTP_EVENT_ACK:
break;
case TFTP_EVENT_RRQ:
case TFTP_EVENT_WRQ:
default:
failf(conn->data, "%s\n", "Internal error: Unexpected packet");
break;
}
/* Update the progress meter */
Curl_pgrsUpdate(conn);
switch(event) {
case TFTP_EVENT_DATA:
Curl_client_write(data, CLIENTWRITE_BODY,
(char *)state->rpacket.u.data.data, state->rbytes-4);
break;
case TFTP_EVENT_ERROR:
state->error = (tftp_error_t)ntohs(state->rpacket.u.error.code);
infof(conn->data, "%s\n", (char *)state->rpacket.u.error.data);
break;
case TFTP_EVENT_ACK:
break;
case TFTP_EVENT_RRQ:
case TFTP_EVENT_WRQ:
default:
failf(conn->data, "%s\n", "Internal error: Unexpected packet");
break;
} }
/* Update the progress meter */
Curl_pgrsUpdate(conn);
} }
/* Check for transfer timeout every 10 blocks, or after timeout */ /* Check for transfer timeout every 10 blocks, or after timeout */