mirror of
https://github.com/curl/curl.git
synced 2026-05-05 07:37:16 +03: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 tob12da22db1#18866 Follow-up todb98daab05#18844 Follow-up to4deea9396b#18814 Follow-up to9678ff5b1b#18776 Follow-up to10bac43b87#18774 Follow-up to20142f5d06#18634 Follow-up tobf7375ecc5#18503 Follow-up to9863599d69#18502 Follow-up to3bb5e58c10#17827 Closes #19626
215 lines
6.4 KiB
C
215 lines
6.4 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 "unitcheck.h"
|
|
|
|
#include "urldata.h"
|
|
#include "connect.h"
|
|
#include "curl_share.h"
|
|
|
|
static CURLcode t1609_setup(void)
|
|
{
|
|
CURLcode res = CURLE_OK;
|
|
global_init(CURL_GLOBAL_ALL);
|
|
return res;
|
|
}
|
|
|
|
/* CURLOPT_RESOLVE address parsing test - to test the following defect fix:
|
|
|
|
1) if there is already existing host:port pair in the DNS cache and
|
|
we call CURLOPT_RESOLVE, it should also replace addresses.
|
|
for example, if there is "test.com:80" with address "1.1.1.1"
|
|
and we called CURLOPT_RESOLVE with address "2.2.2.2", then DNS entry needs to
|
|
reflect that.
|
|
|
|
2) when cached address is already there and close to expire, then by the
|
|
time request is made, it can get expired. This happens because, when
|
|
we set address using CURLOPT_RESOLVE,
|
|
it usually marks as permanent (by setting timestamp to zero). However,
|
|
if address already exists
|
|
in the cache, then it does not mark it, but just leaves it as it is.
|
|
So we fixing this by timestamp to zero if address already exists too.
|
|
|
|
Test:
|
|
|
|
- insert new entry
|
|
- verify that timestamp is not zero
|
|
- call set options with CURLOPT_RESOLVE
|
|
- then, call Curl_loadhostpairs
|
|
|
|
expected result: cached address has zero timestamp.
|
|
|
|
- call set options with CURLOPT_RESOLVE with same host:port pair,
|
|
different address.
|
|
- then, call Curl_loadhostpairs
|
|
|
|
expected result: cached address has zero timestamp and new address
|
|
*/
|
|
|
|
static CURLcode test_unit1609(const char *arg)
|
|
{
|
|
UNITTEST_BEGIN(t1609_setup())
|
|
|
|
struct testcase {
|
|
/* host:port:address[,address]... */
|
|
const char *optval;
|
|
|
|
/* lowercase host and port to retrieve the addresses from hostcache */
|
|
const char *host;
|
|
int port;
|
|
|
|
/* 0 to 9 addresses expected from hostcache */
|
|
const char *address[10];
|
|
};
|
|
|
|
static const struct testcase tests[] = {
|
|
/* spaces are not allowed, for now */
|
|
{ "test.com:80:127.0.0.1",
|
|
"test.com", 80, { "127.0.0.1", }
|
|
},
|
|
{ "test.com:80:127.0.0.2",
|
|
"test.com", 80, { "127.0.0.2", }
|
|
},
|
|
};
|
|
|
|
size_t i;
|
|
struct Curl_multi *multi = NULL;
|
|
struct Curl_easy *easy = NULL;
|
|
struct curl_slist *list = NULL;
|
|
|
|
/* important: we setup cache outside of the loop
|
|
and also clean cache after the loop. In contrast,for example,
|
|
test 1607 sets up and cleans cache on each iteration. */
|
|
|
|
for(i = 0; i < CURL_ARRAYSIZE(tests); ++i) {
|
|
size_t j;
|
|
size_t addressnum = CURL_ARRAYSIZE(tests[i].address);
|
|
struct Curl_addrinfo *addr;
|
|
struct Curl_dns_entry *dns;
|
|
void *entry_id;
|
|
bool problem = false;
|
|
easy = curl_easy_init();
|
|
if(!easy) {
|
|
curl_global_cleanup();
|
|
return CURLE_OUT_OF_MEMORY;
|
|
}
|
|
/* create a multi handle and add the easy handle to it so that the
|
|
hostcache is setup */
|
|
multi = curl_multi_init();
|
|
if(!multi)
|
|
goto error;
|
|
curl_multi_add_handle(multi, easy);
|
|
|
|
list = curl_slist_append(NULL, tests[i].optval);
|
|
if(!list)
|
|
goto error;
|
|
|
|
curl_easy_setopt(easy, CURLOPT_RESOLVE, list);
|
|
|
|
if(Curl_loadhostpairs(easy))
|
|
goto error;
|
|
|
|
entry_id = (void *)curl_maprintf("%s:%d", tests[i].host, tests[i].port);
|
|
if(!entry_id)
|
|
goto error;
|
|
|
|
dns = Curl_hash_pick(&multi->dnscache.entries,
|
|
entry_id, strlen(entry_id) + 1);
|
|
curlx_free(entry_id);
|
|
entry_id = NULL;
|
|
|
|
addr = dns ? dns->addr : NULL;
|
|
|
|
for(j = 0; j < addressnum; ++j) {
|
|
uint16_t port = 0;
|
|
char ipaddress[MAX_IPADR_LEN] = {0};
|
|
|
|
if(!addr && !tests[i].address[j])
|
|
break;
|
|
|
|
if(addr && !Curl_addr2string(addr->ai_addr, addr->ai_addrlen,
|
|
ipaddress, &port)) {
|
|
curl_mfprintf(stderr,
|
|
"%s:%d tests[%zu] failed. Curl_addr2string failed.\n",
|
|
__FILE__, __LINE__, i);
|
|
problem = true;
|
|
break;
|
|
}
|
|
|
|
if(addr && !tests[i].address[j]) {
|
|
curl_mfprintf(stderr, "%s:%d tests[%zu] failed. the retrieved addr "
|
|
"is %s but tests[%zu].address[%zu] is NULL.\n",
|
|
__FILE__, __LINE__, i, ipaddress, i, j);
|
|
problem = true;
|
|
break;
|
|
}
|
|
|
|
if(!addr && tests[i].address[j]) {
|
|
curl_mfprintf(stderr, "%s:%d tests[%zu] failed. the retrieved addr "
|
|
"is NULL but tests[%zu].address[%zu] is %s.\n",
|
|
__FILE__, __LINE__, i, i, j, tests[i].address[j]);
|
|
problem = true;
|
|
break;
|
|
}
|
|
|
|
if(!curl_strequal(ipaddress, tests[i].address[j])) {
|
|
curl_mfprintf(stderr, "%s:%d tests[%zu] failed. the retrieved addr "
|
|
"%s is not equal to tests[%zu].address[%zu] %s.\n",
|
|
__FILE__, __LINE__, i, ipaddress, i, j,
|
|
tests[i].address[j]);
|
|
problem = true;
|
|
break;
|
|
}
|
|
|
|
if(port != tests[i].port) {
|
|
curl_mfprintf(stderr, "%s:%d tests[%zu] failed. the retrieved port "
|
|
"for tests[%zu].address[%zu] is %d "
|
|
"but tests[%zu].port is %d.\n",
|
|
__FILE__, __LINE__, i, i, j, port, i, tests[i].port);
|
|
problem = true;
|
|
break;
|
|
}
|
|
|
|
addr = addr->ai_next;
|
|
}
|
|
|
|
curl_easy_cleanup(easy);
|
|
easy = NULL;
|
|
curl_multi_cleanup(multi);
|
|
multi = NULL;
|
|
curl_slist_free_all(list);
|
|
list = NULL;
|
|
|
|
if(problem) {
|
|
unitfail++;
|
|
continue;
|
|
}
|
|
}
|
|
goto unit_test_abort;
|
|
error:
|
|
curl_easy_cleanup(easy);
|
|
curl_multi_cleanup(multi);
|
|
curl_slist_free_all(list);
|
|
|
|
UNITTEST_END(curl_global_cleanup())
|
|
}
|