mirror of
https://github.com/curl/curl.git
synced 2026-04-14 13:01:42 +08: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
290 lines
7.1 KiB
C
290 lines
7.1 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 "first.h"
|
|
|
|
#ifdef HAVE_LOCALE_H
|
|
#include <locale.h> /* for setlocale() */
|
|
#endif
|
|
|
|
int select_wrapper(int nfds, fd_set *rd, fd_set *wr, fd_set *exc,
|
|
struct timeval *tv)
|
|
{
|
|
if(nfds < 0) {
|
|
SET_SOCKERRNO(SOCKEINVAL);
|
|
return -1;
|
|
}
|
|
#ifdef USE_WINSOCK
|
|
/*
|
|
* Winsock select() requires that at least one of the three fd_set
|
|
* pointers is not NULL and points to a non-empty fdset. IOW Winsock
|
|
* select() can not be used to sleep without a single fd_set.
|
|
*/
|
|
if(!nfds) {
|
|
Sleep((DWORD)curlx_tvtoms(tv));
|
|
return 0;
|
|
}
|
|
#endif
|
|
return select(nfds, rd, wr, exc, tv);
|
|
}
|
|
|
|
const char *libtest_arg2 = NULL;
|
|
const char *libtest_arg3 = NULL;
|
|
const char *libtest_arg4 = NULL;
|
|
int test_argc;
|
|
const char **test_argv;
|
|
int testnum;
|
|
|
|
struct curltime tv_test_start; /* for test timing */
|
|
|
|
int unitfail; /* for unittests */
|
|
|
|
int coptind;
|
|
const char *coptarg;
|
|
|
|
int cgetopt(int argc, const char * const argv[], const char *optstring)
|
|
{
|
|
static int optpos = 1;
|
|
int coptopt;
|
|
const char *arg;
|
|
|
|
if(coptind == 0) { /* Reset? */
|
|
coptind = !!argc;
|
|
optpos = 1;
|
|
}
|
|
|
|
arg = argv[coptind];
|
|
if(arg && strcmp(arg, "--") == 0) {
|
|
coptind++;
|
|
return -1;
|
|
}
|
|
else if(!arg || arg[0] != '-') {
|
|
return -1;
|
|
}
|
|
else {
|
|
const char *opt = strchr(optstring, arg[optpos]);
|
|
coptopt = arg[optpos];
|
|
if(!opt) {
|
|
if(!arg[++optpos]) {
|
|
coptind++;
|
|
optpos = 1;
|
|
}
|
|
return '?';
|
|
}
|
|
else if(opt[1] == ':') {
|
|
if(arg[optpos + 1]) {
|
|
coptarg = arg + optpos + 1;
|
|
coptind++;
|
|
optpos = 1;
|
|
return coptopt;
|
|
}
|
|
else if(argv[coptind + 1]) {
|
|
coptarg = argv[coptind + 1];
|
|
coptind += 2;
|
|
optpos = 1;
|
|
return coptopt;
|
|
}
|
|
else {
|
|
if(!arg[++optpos]) {
|
|
coptind++;
|
|
optpos = 1;
|
|
}
|
|
return *optstring == ':' ? ':' : '?';
|
|
}
|
|
}
|
|
else {
|
|
if(!arg[++optpos]) {
|
|
coptind++;
|
|
optpos = 1;
|
|
}
|
|
return coptopt;
|
|
}
|
|
}
|
|
}
|
|
|
|
#ifdef CURLDEBUG
|
|
static void memory_tracking_init(void)
|
|
{
|
|
const char *env;
|
|
/* if CURL_MEMDEBUG is set, this starts memory tracking message logging */
|
|
env = getenv("CURL_MEMDEBUG");
|
|
if(env) {
|
|
/* use the value as filename */
|
|
curl_dbg_memdebug(env);
|
|
}
|
|
/* if CURL_MEMLIMIT is set, this enables fail-on-alloc-number-N feature */
|
|
env = getenv("CURL_MEMLIMIT");
|
|
if(env) {
|
|
curl_off_t num;
|
|
if(!curlx_str_number(&env, &num, LONG_MAX) && num > 0)
|
|
curl_dbg_memlimit((long)num);
|
|
}
|
|
}
|
|
#else
|
|
# define memory_tracking_init() Curl_nop_stmt
|
|
#endif
|
|
|
|
/* returns a hexdump in a static memory area */
|
|
char *hexdump(const unsigned char *buf, size_t len)
|
|
{
|
|
static char dump[200 * 3 + 1];
|
|
char *p = dump;
|
|
size_t i;
|
|
if(len > 200)
|
|
return NULL;
|
|
for(i = 0; i < len; i++, p += 3)
|
|
curl_msnprintf(p, 4, "%02x ", buf[i]);
|
|
return dump;
|
|
}
|
|
|
|
#ifndef CURL_DISABLE_WEBSOCKETS
|
|
CURLcode ws_send_ping(CURL *curl, const char *send_payload)
|
|
{
|
|
size_t sent;
|
|
CURLcode res = curl_ws_send(curl, send_payload, strlen(send_payload),
|
|
&sent, 0, CURLWS_PING);
|
|
curl_mfprintf(stderr, "ws: curl_ws_send returned %u, sent %zu\n", res, sent);
|
|
return res;
|
|
}
|
|
|
|
CURLcode ws_recv_pong(CURL *curl, const char *expected_payload)
|
|
{
|
|
size_t rlen;
|
|
const struct curl_ws_frame *meta;
|
|
char buffer[256];
|
|
CURLcode res = curl_ws_recv(curl, buffer, sizeof(buffer), &rlen, &meta);
|
|
if(res) {
|
|
curl_mfprintf(stderr, "ws: curl_ws_recv returned %u, received %zu\n",
|
|
res, rlen);
|
|
return res;
|
|
}
|
|
|
|
if(!(meta->flags & CURLWS_PONG)) {
|
|
curl_mfprintf(stderr, "recv_pong: wrong frame, got %zu bytes rflags %x\n",
|
|
rlen, meta->flags);
|
|
return CURLE_RECV_ERROR;
|
|
}
|
|
|
|
curl_mfprintf(stderr, "ws: got PONG back\n");
|
|
if(rlen == strlen(expected_payload) &&
|
|
!memcmp(expected_payload, buffer, rlen)) {
|
|
curl_mfprintf(stderr, "ws: got the same payload back\n");
|
|
return CURLE_OK; /* lib2304 returned 'res' here. Intentional? */
|
|
}
|
|
curl_mfprintf(stderr, "ws: did NOT get the same payload back\n");
|
|
return CURLE_RECV_ERROR;
|
|
}
|
|
|
|
/* just close the connection */
|
|
void ws_close(CURL *curl)
|
|
{
|
|
size_t sent;
|
|
CURLcode res = curl_ws_send(curl, "", 0, &sent, 0, CURLWS_CLOSE);
|
|
curl_mfprintf(stderr, "ws: curl_ws_send returned %u, sent %zu\n", res, sent);
|
|
}
|
|
#endif /* CURL_DISABLE_WEBSOCKETS */
|
|
|
|
|
|
int main(int argc, const char **argv)
|
|
{
|
|
const char *URL = "";
|
|
CURLcode res;
|
|
entry_func_t entry_func;
|
|
const char *entry_name;
|
|
const char *env;
|
|
size_t tmp;
|
|
|
|
CURLX_SET_BINMODE(stdout);
|
|
|
|
memory_tracking_init();
|
|
#ifdef _WIN32
|
|
curlx_now_init();
|
|
#endif
|
|
|
|
/*
|
|
* Setup proper locale from environment. This is needed to enable locale-
|
|
* specific behavior by the C library in order to test for undesired side
|
|
* effects that could cause in libcurl.
|
|
*/
|
|
#ifdef HAVE_SETLOCALE
|
|
setlocale(LC_ALL, "");
|
|
#endif
|
|
|
|
test_argc = argc - 1;
|
|
test_argv = argv + 1;
|
|
|
|
if(argc < 2) {
|
|
curl_mfprintf(stderr, "Pass testname "
|
|
"(and URL as argument for numbered tests) please\n");
|
|
return 1;
|
|
}
|
|
|
|
entry_name = argv[1];
|
|
entry_func = NULL;
|
|
for(tmp = 0; s_entries[tmp].ptr; ++tmp) {
|
|
if(strcmp(entry_name, s_entries[tmp].name) == 0) {
|
|
entry_func = s_entries[tmp].ptr;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if(!entry_func) {
|
|
curl_mfprintf(stderr, "Test '%s' not found.\n", entry_name);
|
|
return 1;
|
|
}
|
|
|
|
if(argc > 2) {
|
|
URL = argv[2];
|
|
curl_mfprintf(stderr, "URL: %s\n", URL);
|
|
}
|
|
|
|
if(argc > 3)
|
|
libtest_arg2 = argv[3];
|
|
|
|
if(argc > 4)
|
|
libtest_arg3 = argv[4];
|
|
|
|
if(argc > 5)
|
|
libtest_arg4 = argv[5];
|
|
|
|
testnum = 0;
|
|
env = getenv("CURL_TESTNUM");
|
|
if(env) {
|
|
curl_off_t num;
|
|
if(!curlx_str_number(&env, &num, INT_MAX) && num > 0)
|
|
testnum = (int)num;
|
|
}
|
|
|
|
res = entry_func(URL);
|
|
curl_mfprintf(stderr, "Test ended with result %d\n", res);
|
|
|
|
#ifdef _WIN32
|
|
/* flush buffers of all streams regardless of mode */
|
|
_flushall();
|
|
#endif
|
|
|
|
/* Regular program status codes are limited to 0..127 and 126 and 127 have
|
|
* special meanings by the shell, so limit a normal return code to 125 */
|
|
return (int)res <= 125 ? (int)res : 125;
|
|
}
|