badwords: prefer 'null-terminated'

Aligning with existing text.

Closes #20979
This commit is contained in:
Viktor Szakats 2026-03-18 11:29:53 +01:00
parent a3699e8b9e
commit 454db7aeee
No known key found for this signature in database
8 changed files with 13 additions and 11 deletions

View file

@ -54,7 +54,7 @@
#endif #endif
struct mem { struct mem {
/* 'buf' points to memory contents that is always zero terminated so that it /* 'buf' points to memory contents that is always null-terminated so that it
can be treated like a string if appropriate. 'recent' points to the most can be treated like a string if appropriate. 'recent' points to the most
recent data written to 'buf'. */ recent data written to 'buf'. */
char *buf, *recent; char *buf, *recent;

View file

@ -114,7 +114,7 @@ static size_t write_cb(void *ptr, size_t size, size_t nmemb, void *stream)
return nmemb * size; return nmemb * size;
} }
/* Remember: do not assume headers are passed on null terminated! */ /* Remember: do not assume headers are passed on null-terminated! */
static size_t SyncTime_CURL_WriteHeader(void *ptr, size_t size, size_t nmemb, static size_t SyncTime_CURL_WriteHeader(void *ptr, size_t size, size_t nmemb,
void *stream) void *stream)
{ {
@ -135,7 +135,7 @@ static size_t SyncTime_CURL_WriteHeader(void *ptr, size_t size, size_t nmemb,
*TmpStr1 = 0; *TmpStr1 = 0;
*TmpStr2 = 0; *TmpStr2 = 0;
if(nmemb && (field[nmemb] == '\n')) { if(nmemb && (field[nmemb] == '\n')) {
field[nmemb] = 0; /* null terminated */ field[nmemb] = 0; /* null-terminated */
RetVal = sscanf(field, "Date: %25s %hu %25s %hu %hu:%hu:%hu", RetVal = sscanf(field, "Date: %25s %hu %25s %hu %hu:%hu:%hu",
TmpStr1, &SYSTime.wDay, TmpStr2, &SYSTime.wYear, TmpStr1, &SYSTime.wDay, TmpStr2, &SYSTime.wYear,
&SYSTime.wHour, &SYSTime.wMinute, &SYSTime.wHour, &SYSTime.wMinute,

View file

@ -101,4 +101,4 @@ char *Curl_bufref_dup(const struct bufref *br);
``` ```
Returns a strdup() version of the buffer. Note that this assumes that the Returns a strdup() version of the buffer. Note that this assumes that the
bufref is null terminated. bufref is null-terminated.

View file

@ -149,7 +149,7 @@ CURLcode curlx_base64_decode(const char *src,
pos += 3 - padding; pos += 3 - padding;
} }
/* Zero terminate */ /* Null-terminate */
*pos = '\0'; *pos = '\0';
/* Return the decoded data */ /* Return the decoded data */
@ -213,7 +213,7 @@ static CURLcode base64_encode(const char *table64,
} }
} }
/* Zero terminate */ /* Null-terminate */
*output = '\0'; *output = '\0';
/* Return the pointer to the new data (allocated memory) */ /* Return the pointer to the new data (allocated memory) */

View file

@ -4187,7 +4187,7 @@ static CURLcode http_rw_hd(struct Curl_easy *data,
CURLcode result = CURLE_OK; CURLcode result = CURLE_OK;
struct SingleRequest *k = &data->req; struct SingleRequest *k = &data->req;
int writetype; int writetype;
DEBUGASSERT(!hd[hdlen]); /* null terminated */ DEBUGASSERT(!hd[hdlen]); /* null-terminated */
*pconsumed = 0; *pconsumed = 0;
if((0x0a == *hd) || (0x0d == *hd)) { if((0x0a == *hd) || (0x0d == *hd)) {
@ -4548,7 +4548,7 @@ CURLcode Curl_http_write_resp_hd(struct Curl_easy *data,
CURLcode result; CURLcode result;
size_t consumed; size_t consumed;
char tmp = 0; char tmp = 0;
DEBUGASSERT(!hd[hdlen]); /* null terminated */ DEBUGASSERT(!hd[hdlen]); /* null-terminated */
result = http_rw_hd(data, hd, hdlen, &tmp, 0, &consumed); result = http_rw_hd(data, hd, hdlen, &tmp, 0, &consumed);
if(!result && is_eos) { if(!result && is_eos) {

View file

@ -794,7 +794,7 @@ CURLcode Curl_xfer_write_resp_hd(struct Curl_easy *data,
const char *hd0, size_t hdlen, bool is_eos) const char *hd0, size_t hdlen, bool is_eos)
{ {
if(data->conn->scheme->run->write_resp_hd) { if(data->conn->scheme->run->write_resp_hd) {
DEBUGASSERT(!hd0[hdlen]); /* null terminated */ DEBUGASSERT(!hd0[hdlen]); /* null-terminated */
/* protocol handlers offering this function take full responsibility /* protocol handlers offering this function take full responsibility
* for writing all received download data to the client. */ * for writing all received download data to the client. */
return data->conn->scheme->run->write_resp_hd(data, hd0, hdlen, is_eos); return data->conn->scheme->run->write_resp_hd(data, hd0, hdlen, is_eos);

View file

@ -517,7 +517,7 @@ static CURLcode mbed_load_cacert(struct Curl_cfilter *cf,
curlx_free(newblob); curlx_free(newblob);
} }
#else #else
/* DER encoded certs do not need to be null terminated because it is a /* DER encoded certs do not need to be null-terminated because it is a
binary format. Thus, if we are not compiling with PEM_PARSE we can avoid binary format. Thus, if we are not compiling with PEM_PARSE we can avoid
the extra memory copies altogether. */ the extra memory copies altogether. */
ret = mbedtls_x509_crt_parse_der(&backend->cacert, ca_info_blob->data, ret = mbedtls_x509_crt_parse_der(&backend->cacert, ca_info_blob->data,
@ -630,7 +630,7 @@ static CURLcode mbed_load_clicert(struct Curl_cfilter *cf,
curlx_free(newblob); curlx_free(newblob);
} }
#else #else
/* DER encoded certs do not need to be null terminated because it is a /* DER encoded certs do not need to be null-terminated because it is a
binary format. Thus, if we are not compiling with PEM_PARSE we can avoid binary format. Thus, if we are not compiling with PEM_PARSE we can avoid
the extra memory copies altogether. */ the extra memory copies altogether. */
ret = mbedtls_x509_crt_parse_der(&backend->clicert, ssl_cert_blob->data, ret = mbedtls_x509_crt_parse_der(&backend->clicert, ssl_cert_blob->data,

View file

@ -19,6 +19,8 @@ wild card:wildcard
thread safe:thread-safe thread safe:thread-safe
thread unsafe:thread-unsafe thread unsafe:thread-unsafe
multi thread:multi-thread multi thread:multi-thread
null terminated:null-terminated
zero terminated:null-terminated
it's:it is it's:it is
aren't:are not aren't:are not
can't:cannot can't:cannot