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

pingpong.c: avoid a memmove call in function Curl_pp_vsendf

Browse Source
This commit is contained in:
Yang Tse
2011-09-05 23:45:04 +02:00
parent a50210710a
commit e9e894905c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/pingpong.c
View File

@@ -195,6 +195,10 @@ CURLcode Curl_pp_vsendf(struct pingpong *pp,
enum protection_level data_sec = conn->data_prot; enum protection_level data_sec = conn->data_prot;
#endif #endif
DEBUGASSERT(pp->sendleft == 0);
DEBUGASSERT(pp->sendsize == 0);
DEBUGASSERT(pp->sendthis == NULL);
fmt_crlf = aprintf("%s\r\n", fmt); /* append a trailing CRLF */ fmt_crlf = aprintf("%s\r\n", fmt); /* append a trailing CRLF */
if(!fmt_crlf) if(!fmt_crlf)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
@@ -236,11 +240,10 @@ CURLcode Curl_pp_vsendf(struct pingpong *pp,
s, (size_t)bytes_written, conn); s, (size_t)bytes_written, conn);
if(bytes_written != (ssize_t)write_len) { if(bytes_written != (ssize_t)write_len) {
/* the whole chunk was not sent, store the rest of the data */ /* the whole chunk was not sent, keep it around and adjust sizes */
write_len -= bytes_written;
memmove(s, s + bytes_written, write_len + 1);
pp->sendthis = s; pp->sendthis = s;
pp->sendsize = pp->sendleft = write_len; pp->sendsize = write_len;
pp->sendleft = write_len - bytes_written;
} }
else { else {
free(s); free(s);