strdup: do Curl_strndup without strncpy

To avoid (false positive) gcc-13 compiler warnings.

Follow-up to 4855debd8a

Assisted-by: Jay Satiro
Reported-by: Viktor Szakats
Fixes #12258
This commit is contained in:
Daniel Stenberg 2023-11-04 23:47:05 +01:00
parent 46878b9e3f
commit ac57e69b58
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
3 changed files with 12 additions and 19 deletions

View file

@ -4608,17 +4608,6 @@ out:
return result;
}
/* simple implementation of strndup(), which isn't portable */
static char *my_strndup(const char *ptr, size_t len)
{
char *copy = malloc(len + 1);
if(!copy)
return NULL;
memcpy(copy, ptr, len);
copy[len] = '\0';
return copy;
}
CURLcode Curl_http_req_make(struct httpreq **preq,
const char *method, size_t m_len,
const char *scheme, size_t s_len,
@ -4637,17 +4626,17 @@ CURLcode Curl_http_req_make(struct httpreq **preq,
goto out;
memcpy(req->method, method, m_len);
if(scheme) {
req->scheme = my_strndup(scheme, s_len);
req->scheme = Curl_strndup(scheme, s_len);
if(!req->scheme)
goto out;
}
if(authority) {
req->authority = my_strndup(authority, a_len);
req->authority = Curl_strndup(authority, a_len);
if(!req->authority)
goto out;
}
if(path) {
req->path = my_strndup(path, p_len);
req->path = Curl_strndup(path, p_len);
if(!req->path)
goto out;
}