mirror of
https://github.com/curl/curl.git
synced 2026-04-19 18:11:13 +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
246 lines
6.5 KiB
C
246 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 "first.h"
|
|
|
|
#define PAUSE_TIME 5
|
|
|
|
struct t670_ReadThis {
|
|
CURL *curl;
|
|
time_t origin;
|
|
int count;
|
|
};
|
|
|
|
static size_t t670_read_cb(char *ptr, size_t size, size_t nmemb, void *userp)
|
|
{
|
|
struct t670_ReadThis *pooh = (struct t670_ReadThis *) userp;
|
|
time_t delta;
|
|
|
|
if(size * nmemb < 1)
|
|
return 0;
|
|
|
|
switch(pooh->count++) {
|
|
case 0:
|
|
*ptr = '\x41'; /* ASCII A. */
|
|
return 1;
|
|
case 1:
|
|
pooh->origin = time(NULL);
|
|
return CURL_READFUNC_PAUSE;
|
|
case 2:
|
|
delta = time(NULL) - pooh->origin;
|
|
*ptr = delta >= PAUSE_TIME ? '\x42' : '\x41'; /* ASCII A or B. */
|
|
return 1;
|
|
case 3:
|
|
return 0;
|
|
}
|
|
curl_mfprintf(stderr, "Read callback called after EOF\n");
|
|
exit(1);
|
|
}
|
|
|
|
static int t670_xferinfo(void *clientp,
|
|
curl_off_t dltotal, curl_off_t dlnow,
|
|
curl_off_t ultotal, curl_off_t ulnow)
|
|
{
|
|
struct t670_ReadThis *pooh = (struct t670_ReadThis *) clientp;
|
|
|
|
(void)dltotal;
|
|
(void)dlnow;
|
|
(void)ultotal;
|
|
(void)ulnow;
|
|
|
|
if(pooh->origin) {
|
|
time_t delta = time(NULL) - pooh->origin;
|
|
|
|
if(delta >= 4 * PAUSE_TIME) {
|
|
curl_mfprintf(stderr, "unpausing failed: drain problem?\n");
|
|
return CURLE_ABORTED_BY_CALLBACK;
|
|
}
|
|
|
|
if(delta >= PAUSE_TIME)
|
|
curl_easy_pause(pooh->curl, CURLPAUSE_CONT);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static CURLcode test_lib670(const char *URL)
|
|
{
|
|
static const char testname[] = "field";
|
|
|
|
curl_mime *mime = NULL;
|
|
struct curl_httppost *formpost = NULL;
|
|
|
|
struct t670_ReadThis pooh;
|
|
CURLcode res = TEST_ERR_FAILURE;
|
|
|
|
/*
|
|
* Check proper pausing/unpausing from a mime or form read callback.
|
|
*/
|
|
|
|
if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
|
|
curl_mfprintf(stderr, "curl_global_init() failed\n");
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
pooh.origin = (time_t) 0;
|
|
pooh.count = 0;
|
|
pooh.curl = curl_easy_init();
|
|
|
|
/* First set the URL that is about to receive our POST. */
|
|
test_setopt(pooh.curl, CURLOPT_URL, URL);
|
|
|
|
/* get verbose debug output please */
|
|
test_setopt(pooh.curl, CURLOPT_VERBOSE, 1L);
|
|
|
|
/* include headers in the output */
|
|
test_setopt(pooh.curl, CURLOPT_HEADER, 1L);
|
|
|
|
if(testnum == 670 || testnum == 671) {
|
|
curl_mimepart *part;
|
|
/* Build the mime tree. */
|
|
mime = curl_mime_init(pooh.curl);
|
|
part = curl_mime_addpart(mime);
|
|
res = curl_mime_name(part, testname);
|
|
if(res != CURLE_OK) {
|
|
curl_mfprintf(stderr,
|
|
"Something went wrong when building the mime structure: %d\n",
|
|
res);
|
|
goto test_cleanup;
|
|
}
|
|
|
|
res = curl_mime_data_cb(part, (curl_off_t) 2, t670_read_cb,
|
|
NULL, NULL, &pooh);
|
|
|
|
/* Bind mime data to its easy handle. */
|
|
if(res == CURLE_OK)
|
|
test_setopt(pooh.curl, CURLOPT_MIMEPOST, mime);
|
|
}
|
|
else {
|
|
struct curl_httppost *lastptr = NULL;
|
|
CURLFORMcode formrc;
|
|
/* Build the form. */
|
|
formrc = curl_formadd(&formpost, &lastptr,
|
|
CURLFORM_COPYNAME, testname,
|
|
CURLFORM_STREAM, &pooh,
|
|
CURLFORM_CONTENTLEN, (curl_off_t) 2,
|
|
CURLFORM_END);
|
|
if(formrc) {
|
|
curl_mfprintf(stderr, "curl_formadd() = %d\n", formrc);
|
|
goto test_cleanup;
|
|
}
|
|
|
|
/* We want to use our own read function. */
|
|
test_setopt(pooh.curl, CURLOPT_READFUNCTION, t670_read_cb);
|
|
|
|
/* Send a multi-part formpost. */
|
|
test_setopt(pooh.curl, CURLOPT_HTTPPOST, formpost);
|
|
}
|
|
|
|
if(testnum == 670 || testnum == 672) {
|
|
CURLMcode mres;
|
|
CURLM *multi;
|
|
/* Use the multi interface. */
|
|
multi = curl_multi_init();
|
|
mres = curl_multi_add_handle(multi, pooh.curl);
|
|
while(!mres) {
|
|
struct timeval timeout;
|
|
int rc = 0;
|
|
fd_set fdread;
|
|
fd_set fdwrite;
|
|
fd_set fdexcept;
|
|
int maxfd = -1;
|
|
int still_running = 0;
|
|
|
|
mres = curl_multi_perform(multi, &still_running);
|
|
if(!still_running || mres != CURLM_OK)
|
|
break;
|
|
|
|
if(pooh.origin) {
|
|
time_t delta = time(NULL) - pooh.origin;
|
|
|
|
if(delta >= 4 * PAUSE_TIME) {
|
|
curl_mfprintf(stderr, "unpausing failed: drain problem?\n");
|
|
res = CURLE_OPERATION_TIMEDOUT;
|
|
break;
|
|
}
|
|
|
|
if(delta >= PAUSE_TIME)
|
|
curl_easy_pause(pooh.curl, CURLPAUSE_CONT);
|
|
}
|
|
|
|
FD_ZERO(&fdread);
|
|
FD_ZERO(&fdwrite);
|
|
FD_ZERO(&fdexcept);
|
|
timeout.tv_sec = 0;
|
|
timeout.tv_usec = 1000000 * PAUSE_TIME / 10;
|
|
mres = curl_multi_fdset(multi, &fdread, &fdwrite, &fdexcept, &maxfd);
|
|
if(mres)
|
|
break;
|
|
#ifdef _WIN32
|
|
if(maxfd == -1)
|
|
curlx_wait_ms(100);
|
|
else
|
|
#endif
|
|
rc = select(maxfd + 1, &fdread, &fdwrite, &fdexcept, &timeout);
|
|
if(rc == -1) {
|
|
curl_mfprintf(stderr, "Select error\n");
|
|
break;
|
|
}
|
|
}
|
|
|
|
if(mres != CURLM_OK)
|
|
for(;;) {
|
|
int msgs_left;
|
|
CURLMsg *msg;
|
|
msg = curl_multi_info_read(multi, &msgs_left);
|
|
if(!msg)
|
|
break;
|
|
if(msg->msg == CURLMSG_DONE) {
|
|
res = msg->data.result;
|
|
}
|
|
}
|
|
|
|
curl_multi_remove_handle(multi, pooh.curl);
|
|
curl_multi_cleanup(multi);
|
|
}
|
|
else {
|
|
/* Use the easy interface. */
|
|
test_setopt(pooh.curl, CURLOPT_XFERINFODATA, &pooh);
|
|
test_setopt(pooh.curl, CURLOPT_XFERINFOFUNCTION, t670_xferinfo);
|
|
test_setopt(pooh.curl, CURLOPT_NOPROGRESS, 0L);
|
|
res = curl_easy_perform(pooh.curl);
|
|
}
|
|
|
|
test_cleanup:
|
|
curl_easy_cleanup(pooh.curl);
|
|
|
|
if(testnum == 670 || testnum == 671) {
|
|
curl_mime_free(mime);
|
|
}
|
|
else {
|
|
curl_formfree(formpost);
|
|
}
|
|
|
|
curl_global_cleanup();
|
|
return res;
|
|
}
|