mirror of
https://github.com/curl/curl.git
synced 2026-01-27 09:54:22 +00:00
Before this patch curl used the C preprocessor to override standard memory allocation symbols: malloc, calloc, strdup, realloc, free. The goal of these is to replace them with curl's debug wrappers in `CURLDEBUG` builds, another was to replace them with the wrappers calling user-defined allocators in libcurl. This solution needed a bunch of workarounds to avoid breaking external headers: it relied on include order to do the overriding last. For "unity" builds it needed to reset overrides before external includes. Also in test apps, which are always built as single source files. It also needed the `(symbol)` trick to avoid overrides in some places. This would still not fix cases where the standard symbols were macros. It was also fragile and difficult to figure out which was the actual function behind an alloc or free call in a specific piece of code. This in turn caused bugs where the wrong allocator was accidentally called. To avoid these problems, this patch replaces this solution with `curlx_`-prefixed allocator macros, and mapping them _once_ to either the libcurl wrappers, the debug wrappers or the standard ones, matching the rest of the code in libtests. This concludes the long journey to avoid redefining standard functions in the curl codebase. Note: I did not update `packages/OS400/*.c` sources. They did not `#include` `curl_setup.h`, `curl_memory.h` or `memdebug.h`, meaning the overrides were never applied to them. This may or may not have been correct. For now I suppressed the direct use of standard allocators via a local `.checksrc`. Probably they (except for `curlcl.c`) should be updated to include `curl_setup.h` and use the `curlx_` macros. This patch changes mappings in two places: - `lib/curl_threads.c` in libtests: Before this patch it mapped to libcurl allocators. After, it maps to standard allocators, like the rest of libtests code. - `units`: before this patch it mapped to standard allocators. After, it maps to libcurl allocators. Also: - drop all position-dependent `curl_memory.h` and `memdebug.h` includes, and delete the now unnecessary headers. - rename `Curl_tcsdup` macro to `curlx_tcsdup` and define like the other allocators. - map `curlx_strdup()` to `_strdup()` on Windows (was: `strdup()`). To fix warnings silenced via `_CRT_NONSTDC_NO_DEPRECATE`. - multibyte: map `curlx_convert_*()` to `_strdup()` on Windows (was: `strdup()`). - src: do not reuse the `strdup` name for the local replacement. - lib509: call `_strdup()` on Windows (was: `strdup()`). - test1132: delete test obsoleted by this patch. - CHECKSRC.md: update text for `SNPRINTF`. - checksrc: ban standard allocator symbols. Follow-up to b12da22db1f11da51082977dc21a7edee7858911 #18866 Follow-up to db98daab05aec251bcb6615d2d38dfebec291736 #18844 Follow-up to 4deea9396bc7dd25c6362fa746a57bf309c74ada #18814 Follow-up to 9678ff5b1bfea1c847aee4f9edf023e8f01c9293 #18776 Follow-up to 10bac43b873fe45869e15b36aac1c1e5bc89b6e0 #18774 Follow-up to 20142f5d06f7120ba94cbcc25c998e8d81aec85b #18634 Follow-up to bf7375ecc50e857760b0d0a668c436e208a400bd #18503 Follow-up to 9863599d69b79d290928a89bf9160f4e4e023d4e #18502 Follow-up to 3bb5e58c105d7be450b667858d1b8e7ae3ded555 #17827 Closes #19626
213 lines
6.5 KiB
C
213 lines
6.5 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#ifdef USE_HTTPSRR
|
|
|
|
#include "urldata.h"
|
|
#include "curl_addrinfo.h"
|
|
#include "httpsrr.h"
|
|
#include "connect.h"
|
|
#include "sendf.h"
|
|
#include "strdup.h"
|
|
|
|
static CURLcode httpsrr_decode_alpn(const uint8_t *cp, size_t len,
|
|
unsigned char *alpns)
|
|
{
|
|
/*
|
|
* The wire-format value for "alpn" consists of at least one alpn-id
|
|
* prefixed by its length as a single octet, and these length-value pairs
|
|
* are concatenated to form the SvcParamValue. These pairs MUST exactly fill
|
|
* the SvcParamValue; otherwise, the SvcParamValue is malformed.
|
|
*/
|
|
int idnum = 0;
|
|
|
|
while(len > 0) {
|
|
size_t tlen = *cp++;
|
|
enum alpnid id;
|
|
len--;
|
|
if(tlen > len)
|
|
return CURLE_BAD_CONTENT_ENCODING;
|
|
|
|
/* we only store ALPN ids we know about */
|
|
id = Curl_alpn2alpnid(cp, tlen);
|
|
if(id != ALPN_none) {
|
|
if(idnum == MAX_HTTPSRR_ALPNS)
|
|
break;
|
|
if(idnum && memchr(alpns, id, idnum))
|
|
/* this ALPN id is already stored */
|
|
;
|
|
else
|
|
alpns[idnum++] = (unsigned char)id;
|
|
}
|
|
cp += tlen;
|
|
len -= tlen;
|
|
}
|
|
if(idnum < MAX_HTTPSRR_ALPNS)
|
|
alpns[idnum] = ALPN_none; /* terminate the list */
|
|
return CURLE_OK;
|
|
}
|
|
|
|
CURLcode Curl_httpsrr_set(struct Curl_easy *data,
|
|
struct Curl_https_rrinfo *hi,
|
|
uint16_t rrkey, const uint8_t *val, size_t vlen)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
switch(rrkey) {
|
|
case HTTPS_RR_CODE_MANDATORY:
|
|
CURL_TRC_DNS(data, "HTTPS RR MANDATORY left to implement");
|
|
break;
|
|
case HTTPS_RR_CODE_ALPN: /* str_list */
|
|
result = httpsrr_decode_alpn(val, vlen, hi->alpns);
|
|
CURL_TRC_DNS(data, "HTTPS RR ALPN: %u %u %u %u",
|
|
hi->alpns[0], hi->alpns[1], hi->alpns[2], hi->alpns[3]);
|
|
break;
|
|
case HTTPS_RR_CODE_NO_DEF_ALPN:
|
|
if(vlen) /* no data */
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
hi->no_def_alpn = TRUE;
|
|
CURL_TRC_DNS(data, "HTTPS RR no-def-alpn");
|
|
break;
|
|
case HTTPS_RR_CODE_IPV4: /* addr4 list */
|
|
if(!vlen || (vlen & 3)) /* the size must be 4-byte aligned */
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
curlx_free(hi->ipv4hints);
|
|
hi->ipv4hints = Curl_memdup(val, vlen);
|
|
if(!hi->ipv4hints)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
hi->ipv4hints_len = vlen;
|
|
CURL_TRC_DNS(data, "HTTPS RR IPv4");
|
|
break;
|
|
case HTTPS_RR_CODE_ECH:
|
|
if(!vlen)
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
curlx_free(hi->echconfiglist);
|
|
hi->echconfiglist = Curl_memdup(val, vlen);
|
|
if(!hi->echconfiglist)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
hi->echconfiglist_len = vlen;
|
|
CURL_TRC_DNS(data, "HTTPS RR ECH");
|
|
break;
|
|
case HTTPS_RR_CODE_IPV6: /* addr6 list */
|
|
if(!vlen || (vlen & 15)) /* the size must be 16-byte aligned */
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
curlx_free(hi->ipv6hints);
|
|
hi->ipv6hints = Curl_memdup(val, vlen);
|
|
if(!hi->ipv6hints)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
hi->ipv6hints_len = vlen;
|
|
CURL_TRC_DNS(data, "HTTPS RR IPv6");
|
|
break;
|
|
case HTTPS_RR_CODE_PORT:
|
|
if(vlen != 2)
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
hi->port = (unsigned short)((val[0] << 8) | val[1]);
|
|
CURL_TRC_DNS(data, "HTTPS RR port %u", hi->port);
|
|
break;
|
|
default:
|
|
CURL_TRC_DNS(data, "HTTPS RR unknown code");
|
|
break;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
struct Curl_https_rrinfo *
|
|
Curl_httpsrr_dup_move(struct Curl_https_rrinfo *rrinfo)
|
|
{
|
|
struct Curl_https_rrinfo *dup = Curl_memdup(rrinfo, sizeof(*rrinfo));
|
|
if(dup)
|
|
memset(rrinfo, 0, sizeof(*rrinfo));
|
|
return dup;
|
|
}
|
|
|
|
void Curl_httpsrr_cleanup(struct Curl_https_rrinfo *rrinfo)
|
|
{
|
|
Curl_safefree(rrinfo->target);
|
|
Curl_safefree(rrinfo->echconfiglist);
|
|
Curl_safefree(rrinfo->ipv4hints);
|
|
Curl_safefree(rrinfo->ipv6hints);
|
|
Curl_safefree(rrinfo->rrname);
|
|
}
|
|
|
|
|
|
#ifdef USE_ARES
|
|
|
|
static CURLcode httpsrr_opt(struct Curl_easy *data,
|
|
const ares_dns_rr_t *rr,
|
|
ares_dns_rr_key_t key, size_t idx,
|
|
struct Curl_https_rrinfo *hinfo)
|
|
{
|
|
const unsigned char *val = NULL;
|
|
unsigned short code;
|
|
size_t len = 0;
|
|
|
|
code = ares_dns_rr_get_opt(rr, key, idx, &val, &len);
|
|
return Curl_httpsrr_set(data, hinfo, code, val, len);
|
|
}
|
|
|
|
CURLcode Curl_httpsrr_from_ares(struct Curl_easy *data,
|
|
const ares_dns_record_t *dnsrec,
|
|
struct Curl_https_rrinfo *hinfo)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
size_t i;
|
|
|
|
for(i = 0; i < ares_dns_record_rr_cnt(dnsrec, ARES_SECTION_ANSWER); i++) {
|
|
const char *target;
|
|
size_t opt;
|
|
const ares_dns_rr_t *rr =
|
|
ares_dns_record_rr_get_const(dnsrec, ARES_SECTION_ANSWER, i);
|
|
if(ares_dns_rr_get_type(rr) != ARES_REC_TYPE_HTTPS)
|
|
continue;
|
|
/* When SvcPriority is 0, the SVCB record is in AliasMode. Otherwise, it
|
|
is in ServiceMode */
|
|
target = ares_dns_rr_get_str(rr, ARES_RR_HTTPS_TARGET);
|
|
if(target && target[0]) {
|
|
curlx_free(hinfo->target);
|
|
hinfo->target = curlx_strdup(target);
|
|
if(!hinfo->target) {
|
|
result = CURLE_OUT_OF_MEMORY;
|
|
goto out;
|
|
}
|
|
CURL_TRC_DNS(data, "HTTPS RR target: %s", hinfo->target);
|
|
}
|
|
CURL_TRC_DNS(data, "HTTPS RR priority: %u",
|
|
ares_dns_rr_get_u16(rr, ARES_RR_HTTPS_PRIORITY));
|
|
for(opt = 0; opt < ares_dns_rr_get_opt_cnt(rr, ARES_RR_HTTPS_PARAMS);
|
|
opt++) {
|
|
result = httpsrr_opt(data, rr, ARES_RR_HTTPS_PARAMS, opt, hinfo);
|
|
if(result)
|
|
break;
|
|
}
|
|
}
|
|
out:
|
|
Curl_safefree(hinfo->rrname);
|
|
return result;
|
|
}
|
|
|
|
#endif /* USE_ARES */
|
|
|
|
#endif /* USE_HTTPSRR */
|