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
210 lines
6.1 KiB
C
210 lines
6.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"
|
|
|
|
struct t554_WriteThis {
|
|
const char *readptr;
|
|
size_t sizeleft;
|
|
};
|
|
|
|
static size_t t554_read_cb(char *ptr, size_t size, size_t nmemb, void *userp)
|
|
{
|
|
struct t554_WriteThis *pooh = (struct t554_WriteThis *)userp;
|
|
|
|
if(size*nmemb < 1)
|
|
return 0;
|
|
|
|
if(pooh->sizeleft) {
|
|
*ptr = pooh->readptr[0]; /* copy one single byte */
|
|
pooh->readptr++; /* advance pointer */
|
|
pooh->sizeleft--; /* less data left */
|
|
return 1; /* we return 1 byte at a time! */
|
|
}
|
|
|
|
return 0; /* no more data left to deliver */
|
|
}
|
|
|
|
static size_t t587_read_cb(char *ptr, size_t size, size_t nmemb, void *userp)
|
|
{
|
|
(void)ptr;
|
|
(void)size;
|
|
(void)nmemb;
|
|
(void)userp;
|
|
return CURL_READFUNC_ABORT;
|
|
}
|
|
|
|
static CURLcode t554_test_once(const char *URL, bool oldstyle)
|
|
{
|
|
static const char testdata[] =
|
|
"this is what we post to the silly web server\n";
|
|
|
|
CURL *curl;
|
|
CURLcode res = CURLE_OK;
|
|
CURLFORMcode formrc;
|
|
|
|
struct curl_httppost *formpost = NULL;
|
|
struct curl_httppost *lastptr = NULL;
|
|
struct t554_WriteThis pooh;
|
|
struct t554_WriteThis pooh2;
|
|
|
|
pooh.readptr = testdata;
|
|
pooh.sizeleft = strlen(testdata);
|
|
|
|
/* Fill in the file upload field */
|
|
if(oldstyle) {
|
|
formrc = curl_formadd(&formpost,
|
|
&lastptr,
|
|
CURLFORM_COPYNAME, "sendfile",
|
|
CURLFORM_STREAM, &pooh,
|
|
CURLFORM_CONTENTSLENGTH, (long)pooh.sizeleft,
|
|
CURLFORM_FILENAME, "postit2.c",
|
|
CURLFORM_END);
|
|
}
|
|
else {
|
|
/* new style */
|
|
formrc = curl_formadd(&formpost,
|
|
&lastptr,
|
|
CURLFORM_COPYNAME, "sendfile alternative",
|
|
CURLFORM_STREAM, &pooh,
|
|
CURLFORM_CONTENTLEN, (curl_off_t)pooh.sizeleft,
|
|
CURLFORM_FILENAME, "filename 2 ",
|
|
CURLFORM_END);
|
|
}
|
|
|
|
if(formrc)
|
|
curl_mprintf("curl_formadd(1) = %d\n", formrc);
|
|
|
|
/* Now add the same data with another name and make it not look like
|
|
a file upload but still using the callback */
|
|
|
|
pooh2.readptr = testdata;
|
|
pooh2.sizeleft = strlen(testdata);
|
|
|
|
/* Fill in the file upload field */
|
|
formrc = curl_formadd(&formpost,
|
|
&lastptr,
|
|
CURLFORM_COPYNAME, "callbackdata",
|
|
CURLFORM_STREAM, &pooh2,
|
|
CURLFORM_CONTENTSLENGTH, (long)pooh2.sizeleft,
|
|
CURLFORM_END);
|
|
|
|
if(formrc)
|
|
curl_mprintf("curl_formadd(2) = %d\n", formrc);
|
|
|
|
/* Fill in the filename field */
|
|
formrc = curl_formadd(&formpost,
|
|
&lastptr,
|
|
CURLFORM_COPYNAME, "filename",
|
|
CURLFORM_COPYCONTENTS, "postit2.c",
|
|
CURLFORM_END);
|
|
if(formrc)
|
|
curl_mprintf("curl_formadd(3) = %d\n", formrc);
|
|
|
|
/* Fill in a submit field too */
|
|
formrc = curl_formadd(&formpost,
|
|
&lastptr,
|
|
CURLFORM_COPYNAME, "submit",
|
|
CURLFORM_COPYCONTENTS, "send",
|
|
CURLFORM_CONTENTTYPE, "text/plain",
|
|
CURLFORM_END);
|
|
|
|
if(formrc)
|
|
curl_mprintf("curl_formadd(4) = %d\n", formrc);
|
|
|
|
formrc = curl_formadd(&formpost, &lastptr,
|
|
CURLFORM_COPYNAME, "somename",
|
|
CURLFORM_BUFFER, "somefile.txt",
|
|
CURLFORM_BUFFERPTR, "blah blah",
|
|
CURLFORM_BUFFERLENGTH, 9L,
|
|
CURLFORM_END);
|
|
|
|
if(formrc)
|
|
curl_mprintf("curl_formadd(5) = %d\n", formrc);
|
|
|
|
curl = curl_easy_init();
|
|
if(!curl) {
|
|
curl_mfprintf(stderr, "curl_easy_init() failed\n");
|
|
curl_formfree(formpost);
|
|
curl_global_cleanup();
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
/* First set the URL that is about to receive our POST. */
|
|
test_setopt(curl, CURLOPT_URL, URL);
|
|
|
|
/* Now specify we want to POST data */
|
|
test_setopt(curl, CURLOPT_POST, 1L);
|
|
|
|
/* Set the expected POST size */
|
|
test_setopt(curl, CURLOPT_POSTFIELDSIZE, (long)pooh.sizeleft);
|
|
|
|
/* we want to use our own read function */
|
|
if(testnum == 587) {
|
|
test_setopt(curl, CURLOPT_READFUNCTION, t587_read_cb);
|
|
}
|
|
else {
|
|
test_setopt(curl, CURLOPT_READFUNCTION, t554_read_cb);
|
|
}
|
|
|
|
/* send a multi-part formpost */
|
|
test_setopt(curl, CURLOPT_HTTPPOST, formpost);
|
|
|
|
/* get verbose debug output please */
|
|
test_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
|
|
/* include headers in the output */
|
|
test_setopt(curl, CURLOPT_HEADER, 1L);
|
|
|
|
/* Perform the request, res will get the return code */
|
|
res = curl_easy_perform(curl);
|
|
|
|
test_cleanup:
|
|
|
|
/* always cleanup */
|
|
curl_easy_cleanup(curl);
|
|
|
|
/* now cleanup the formpost chain */
|
|
curl_formfree(formpost);
|
|
|
|
return res;
|
|
}
|
|
|
|
static CURLcode test_lib554(const char *URL)
|
|
{
|
|
CURLcode res;
|
|
|
|
if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
|
|
curl_mfprintf(stderr, "curl_global_init() failed\n");
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
res = t554_test_once(URL, TRUE); /* old */
|
|
if(!res)
|
|
res = t554_test_once(URL, FALSE); /* new */
|
|
|
|
curl_global_cleanup();
|
|
|
|
return res;
|
|
}
|