mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-12-27 06:59:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

tftp: avoid two memcpy/strcpy

Browse Source 
Closes #15199
This commit is contained in:
Daniel Stenberg 2024-10-08 15:19:31 +02:00
parent d90a8f07ed
commit c5b8569c7c
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/tftp.c
View File

@ -482,11 +482,9 @@ static CURLcode tftp_send_first(struct tftp_state_data *state,
if(!data->set.tftp_no_options) {
char buf[64];
/* add tsize option */
if(data->state.upload && (data->state.infilesize != -1))
msnprintf(buf, sizeof(buf), "%" FMT_OFF_T,
data->state.infilesize);
else
strcpy(buf, "0"); /* the destination is large enough */
msnprintf(buf, sizeof(buf), "%" FMT_OFF_T,
data->state.upload && (data->state.infilesize != -1) ?
data->state.infilesize : 0);
result = tftp_option_add(state, &sbytes,
(char *)state->spacket.data + sbytes,
@ -1099,24 +1097,20 @@ static int tftp_getsock(struct Curl_easy *data,
**********************************************************/
static CURLcode tftp_receive_packet(struct Curl_easy *data)
{
struct Curl_sockaddr_storage fromaddr;
curl_socklen_t fromlen;
CURLcode result = CURLE_OK;
struct connectdata *conn = data->conn;
struct tftp_state_data *state = conn->proto.tftpc;
/* Receive the packet */
fromlen = sizeof(fromaddr);
fromlen = sizeof(state->remote_addr);
state->rbytes = (int)recvfrom(state->sockfd,
(void *)state->rpacket.data,
(RECV_TYPE_ARG3)state->blksize + 4,
0,
(struct sockaddr *)&fromaddr,
(struct sockaddr *)&state->remote_addr,
&fromlen);
if(state->remote_addrlen == 0) {
memcpy(&state->remote_addr, &fromaddr, fromlen);
state->remote_addrlen = fromlen;
}
state->remote_addrlen = fromlen;
/* Sanity check packet length */
if(state->rbytes < 4) {