luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib: remove strlen call from Curl_client_write

Browse Source 
At all call sites with an explicit 0 len, pass an appropriate nonzero
len.

Closes #6954
This commit is contained in:
Jacob Hoffman-Andrews 2021-04-24 10:33:56 -07:00 committed by Daniel Stenberg
parent 6aae7b1761
commit f4b85d24b2
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/file.c
View File

@ -410,16 +410,18 @@ static CURLcode file_do(struct Curl_easy *data, bool *done)
struct tm buffer; struct tm buffer;
const struct tm *tm = &buffer; const struct tm *tm = &buffer;
char header[80]; char header[80];
int headerlen;
char accept_ranges[24]= { "Accept-ranges: bytes\r\n" };
if(expected_size >= 0) { if(expected_size >= 0) {
msnprintf(header, sizeof(header), headerlen = msnprintf(header, sizeof(header),
"Content-Length: %" CURL_FORMAT_CURL_OFF_T "\r\n", "Content-Length: %" CURL_FORMAT_CURL_OFF_T "\r\n",
expected_size); expected_size);
result = Curl_client_write(data, CLIENTWRITE_HEADER, header, 0); result = Curl_client_write(data, CLIENTWRITE_HEADER, header, headerlen);
if(result) if(result)
return result; return result;
result = Curl_client_write(data, CLIENTWRITE_HEADER, result = Curl_client_write(data, CLIENTWRITE_HEADER,
(char *)"Accept-ranges: bytes\r\n", 0); accept_ranges, strlen(accept_ranges));
if(result != CURLE_OK) if(result != CURLE_OK)
return result; return result;
} }
@ -430,7 +432,7 @@ static CURLcode file_do(struct Curl_easy *data, bool *done)
return result; return result;
/* format: "Tue, 15 Nov 1994 12:45:26 GMT" */ /* format: "Tue, 15 Nov 1994 12:45:26 GMT" */
msnprintf(header, sizeof(header), headerlen = msnprintf(header, sizeof(header),
"Last-Modified: %s, %02d %s %4d %02d:%02d:%02d GMT\r\n%s", "Last-Modified: %s, %02d %s %4d %02d:%02d:%02d GMT\r\n%s",
Curl_wkday[tm->tm_wday?tm->tm_wday-1:6], Curl_wkday[tm->tm_wday?tm->tm_wday-1:6],
tm->tm_mday, tm->tm_mday,
@ -440,7 +442,7 @@ static CURLcode file_do(struct Curl_easy *data, bool *done)
tm->tm_min, tm->tm_min,
tm->tm_sec, tm->tm_sec,
data->set.opt_no_body ? "": "\r\n"); data->set.opt_no_body ? "": "\r\n");
result = Curl_client_write(data, CLIENTWRITE_HEADER, header, 0); result = Curl_client_write(data, CLIENTWRITE_HEADER, header, headerlen);
if(result) if(result)
return result; return result;
/* set the file size to make it available post transfer */ /* set the file size to make it available post transfer */

13
lib/ftp.c
View File

@ -2098,6 +2098,7 @@ static CURLcode ftp_state_mdtm_resp(struct Curl_easy *data,
data->set.get_filetime && data->set.get_filetime &&
(data->info.filetime >= 0) ) { (data->info.filetime >= 0) ) {
char headerbuf[128]; char headerbuf[128];
int headerbuflen;
time_t filetime = data->info.filetime; time_t filetime = data->info.filetime;
struct tm buffer; struct tm buffer;
const struct tm *tm = &buffer; const struct tm *tm = &buffer;
@ -2107,7 +2108,7 @@ static CURLcode ftp_state_mdtm_resp(struct Curl_easy *data,
return result; return result;
/* format: "Tue, 15 Nov 1994 12:45:26" */ /* format: "Tue, 15 Nov 1994 12:45:26" */
msnprintf(headerbuf, sizeof(headerbuf), headerbuflen = msnprintf(headerbuf, sizeof(headerbuf),
"Last-Modified: %s, %02d %s %4d %02d:%02d:%02d GMT\r\n", "Last-Modified: %s, %02d %s %4d %02d:%02d:%02d GMT\r\n",
Curl_wkday[tm->tm_wday?tm->tm_wday-1:6], Curl_wkday[tm->tm_wday?tm->tm_wday-1:6],
tm->tm_mday, tm->tm_mday,
@ -2116,7 +2117,8 @@ static CURLcode ftp_state_mdtm_resp(struct Curl_easy *data,
tm->tm_hour, tm->tm_hour,
tm->tm_min, tm->tm_min,
tm->tm_sec); tm->tm_sec);
result = Curl_client_write(data, CLIENTWRITE_BOTH, headerbuf, 0); result = Curl_client_write(data, CLIENTWRITE_BOTH, headerbuf,
headerbuflen);
if(result) if(result)
return result; return result;
} /* end of a ridiculous amount of conditionals */ } /* end of a ridiculous amount of conditionals */
@ -2321,9 +2323,9 @@ static CURLcode ftp_state_size_resp(struct Curl_easy *data,
#ifdef CURL_FTP_HTTPSTYLE_HEAD #ifdef CURL_FTP_HTTPSTYLE_HEAD
if(-1 != filesize) { if(-1 != filesize) {
char clbuf[128]; char clbuf[128];
msnprintf(clbuf, sizeof(clbuf), int clbuflen = msnprintf(clbuf, sizeof(clbuf),
"Content-Length: %" CURL_FORMAT_CURL_OFF_T "\r\n", filesize); "Content-Length: %" CURL_FORMAT_CURL_OFF_T "\r\n", filesize);
result = Curl_client_write(data, CLIENTWRITE_BOTH, clbuf, 0); result = Curl_client_write(data, CLIENTWRITE_BOTH, clbuf, clbuflen);
if(result) if(result)
return result; return result;
} }
@ -2357,7 +2359,8 @@ static CURLcode ftp_state_rest_resp(struct Curl_easy *data,
#ifdef CURL_FTP_HTTPSTYLE_HEAD #ifdef CURL_FTP_HTTPSTYLE_HEAD
if(ftpcode == 350) { if(ftpcode == 350) {
char buffer[24]= { "Accept-ranges: bytes\r\n" }; char buffer[24]= { "Accept-ranges: bytes\r\n" };
result = Curl_client_write(data, CLIENTWRITE_BOTH, buffer, 0); result = Curl_client_write(data, CLIENTWRITE_BOTH, buffer,
strlen(buffer));
if(result) if(result)
return result; return result;
} }

6
lib/openldap.c
View File

@ -666,7 +666,7 @@ static ssize_t ldap_recv(struct Curl_easy *data, int sockindex, char *buf,
data->req.bytecount += bvals[i].bv_len + 1; data->req.bytecount += bvals[i].bv_len + 1;
} }
writeerr = Curl_client_write(data, CLIENTWRITE_BODY, (char *)"\n", 0); writeerr = Curl_client_write(data, CLIENTWRITE_BODY, (char *)"\n", 1);
if(writeerr) { if(writeerr) {
*err = writeerr; *err = writeerr;
return -1; return -1;
@ -675,14 +675,14 @@ static ssize_t ldap_recv(struct Curl_easy *data, int sockindex, char *buf,
data->req.bytecount++; data->req.bytecount++;
} }
ber_memfree(bvals); ber_memfree(bvals);
writeerr = Curl_client_write(data, CLIENTWRITE_BODY, (char *)"\n", 0); writeerr = Curl_client_write(data, CLIENTWRITE_BODY, (char *)"\n", 1);
if(writeerr) { if(writeerr) {
*err = writeerr; *err = writeerr;
return -1; return -1;
} }
data->req.bytecount++; data->req.bytecount++;
} }
writeerr = Curl_client_write(data, CLIENTWRITE_BODY, (char *)"\n", 0); writeerr = Curl_client_write(data, CLIENTWRITE_BODY, (char *)"\n", 1);
if(writeerr) { if(writeerr) {
*err = writeerr; *err = writeerr;
return -1; return -1;

3
lib/sendf.c
View File

@ -616,9 +616,8 @@ CURLcode Curl_client_write(struct Curl_easy *data,
size_t len) size_t len)
{ {
struct connectdata *conn = data->conn; struct connectdata *conn = data->conn;
if(0 == len)
len = strlen(ptr);
DEBUGASSERT(len);
DEBUGASSERT(type <= 3); DEBUGASSERT(type <= 3);
/* FTP data may need conversion. */ /* FTP data may need conversion. */