mirror of
https://github.com/curl/curl.git
synced 2026-06-04 17:14:15 +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
234 lines
6.1 KiB
C
234 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 "tool_setup.h"
|
|
|
|
#include "slist_wc.h"
|
|
|
|
#ifndef CURL_DISABLE_LIBCURL_OPTION
|
|
|
|
#include "tool_cfgable.h"
|
|
#include "tool_easysrc.h"
|
|
#include "tool_msgs.h"
|
|
|
|
/* global variable definitions, for easy-interface source code generation */
|
|
|
|
struct slist_wc *easysrc_decl; /* Variable declarations */
|
|
struct slist_wc *easysrc_data; /* Build slists, forms etc. */
|
|
struct slist_wc *easysrc_code; /* Setopt calls */
|
|
struct slist_wc *easysrc_toohard; /* Unconvertible setopt */
|
|
struct slist_wc *easysrc_clean; /* Clean up allocated data */
|
|
int easysrc_mime_count;
|
|
int easysrc_slist_count;
|
|
|
|
static const char *const srchead[]={
|
|
"/********* Sample code generated by the curl command line tool **********",
|
|
" * All curl_easy_setopt() options are documented at:",
|
|
" * https://curl.se/libcurl/c/curl_easy_setopt.html",
|
|
" ************************************************************************/",
|
|
"#include <curl/curl.h>",
|
|
"",
|
|
"int main(int argc, char *argv[])",
|
|
"{",
|
|
" CURLcode ret;",
|
|
" CURL *hnd;",
|
|
NULL
|
|
};
|
|
/* easysrc_decl declarations come here */
|
|
/* easysrc_data initialization come here */
|
|
/* easysrc_code statements come here */
|
|
static const char *const srchard[]={
|
|
"/* Here is a list of options the curl code used that cannot get generated",
|
|
" as source easily. You may choose to either not use them or implement",
|
|
" them yourself.",
|
|
"",
|
|
NULL
|
|
};
|
|
static const char *const srcend[]={
|
|
"",
|
|
" return (int)ret;",
|
|
"}",
|
|
"/**** End of sample code ****/",
|
|
NULL
|
|
};
|
|
|
|
/* Clean up all source code if we run out of memory */
|
|
static void easysrc_free(void)
|
|
{
|
|
slist_wc_free_all(easysrc_decl);
|
|
easysrc_decl = NULL;
|
|
slist_wc_free_all(easysrc_data);
|
|
easysrc_data = NULL;
|
|
slist_wc_free_all(easysrc_code);
|
|
easysrc_code = NULL;
|
|
slist_wc_free_all(easysrc_toohard);
|
|
easysrc_toohard = NULL;
|
|
slist_wc_free_all(easysrc_clean);
|
|
easysrc_clean = NULL;
|
|
}
|
|
|
|
/* Add a source line to the main code or remarks */
|
|
CURLcode easysrc_add(struct slist_wc **plist, const char *line)
|
|
{
|
|
CURLcode ret = CURLE_OK;
|
|
struct slist_wc *list = slist_wc_append(*plist, line);
|
|
if(!list) {
|
|
easysrc_free();
|
|
ret = CURLE_OUT_OF_MEMORY;
|
|
}
|
|
else
|
|
*plist = list;
|
|
return ret;
|
|
}
|
|
|
|
CURLcode easysrc_addf(struct slist_wc **plist, const char *fmt, ...)
|
|
{
|
|
CURLcode ret;
|
|
char *bufp;
|
|
va_list ap;
|
|
va_start(ap, fmt);
|
|
bufp = curl_mvaprintf(fmt, ap);
|
|
va_end(ap);
|
|
if(!bufp) {
|
|
ret = CURLE_OUT_OF_MEMORY;
|
|
}
|
|
else {
|
|
ret = easysrc_add(plist, bufp);
|
|
curl_free(bufp);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
CURLcode easysrc_init(void)
|
|
{
|
|
return easysrc_add(&easysrc_code, "hnd = curl_easy_init();");
|
|
}
|
|
|
|
CURLcode easysrc_perform(void)
|
|
{
|
|
CURLcode ret = CURLE_OK;
|
|
/* Note any setopt calls which we could not convert */
|
|
if(easysrc_toohard) {
|
|
int i;
|
|
struct curl_slist *ptr;
|
|
ret = easysrc_add(&easysrc_code, "");
|
|
/* Preamble comment */
|
|
for(i = 0; srchard[i] && !ret; i++)
|
|
ret = easysrc_add(&easysrc_code, srchard[i]);
|
|
/* Each unconverted option */
|
|
if(easysrc_toohard && !ret) {
|
|
for(ptr = easysrc_toohard->first; ptr && !ret; ptr = ptr->next)
|
|
ret = easysrc_add(&easysrc_code, ptr->data);
|
|
}
|
|
if(!ret)
|
|
ret = easysrc_add(&easysrc_code, "");
|
|
if(!ret)
|
|
ret = easysrc_add(&easysrc_code, "*/");
|
|
|
|
slist_wc_free_all(easysrc_toohard);
|
|
easysrc_toohard = NULL;
|
|
}
|
|
|
|
if(!ret)
|
|
ret = easysrc_add(&easysrc_code, "");
|
|
if(!ret)
|
|
ret = easysrc_add(&easysrc_code, "ret = curl_easy_perform(hnd);");
|
|
if(!ret)
|
|
ret = easysrc_add(&easysrc_code, "");
|
|
|
|
return ret;
|
|
}
|
|
|
|
CURLcode easysrc_cleanup(void)
|
|
{
|
|
CURLcode ret = easysrc_add(&easysrc_code, "curl_easy_cleanup(hnd);");
|
|
if(!ret)
|
|
ret = easysrc_add(&easysrc_code, "hnd = NULL;");
|
|
|
|
return ret;
|
|
}
|
|
|
|
void dumpeasysrc(void)
|
|
{
|
|
struct curl_slist *ptr;
|
|
char *o = global->libcurl;
|
|
|
|
FILE *out;
|
|
bool fopened = FALSE;
|
|
if(strcmp(o, "-")) {
|
|
out = curlx_fopen(o, FOPEN_WRITETEXT);
|
|
fopened = TRUE;
|
|
}
|
|
else
|
|
out = stdout;
|
|
if(!out)
|
|
warnf("Failed to open %s to write libcurl code", o);
|
|
else {
|
|
int i;
|
|
const char *c;
|
|
|
|
for(i = 0; ((c = srchead[i]) != NULL); i++)
|
|
curl_mfprintf(out, "%s\n", c);
|
|
|
|
/* Declare variables used for complex setopt values */
|
|
if(easysrc_decl) {
|
|
for(ptr = easysrc_decl->first; ptr; ptr = ptr->next)
|
|
curl_mfprintf(out, " %s\n", ptr->data);
|
|
}
|
|
|
|
/* Set up complex values for setopt calls */
|
|
if(easysrc_data) {
|
|
curl_mfprintf(out, "\n");
|
|
|
|
for(ptr = easysrc_data->first; ptr; ptr = ptr->next)
|
|
curl_mfprintf(out, " %s\n", ptr->data);
|
|
}
|
|
|
|
curl_mfprintf(out, "\n");
|
|
if(easysrc_code) {
|
|
for(ptr = easysrc_code->first; ptr; ptr = ptr->next) {
|
|
if(ptr->data[0]) {
|
|
curl_mfprintf(out, " %s\n", ptr->data);
|
|
}
|
|
else {
|
|
curl_mfprintf(out, "\n");
|
|
}
|
|
}
|
|
}
|
|
|
|
if(easysrc_clean) {
|
|
for(ptr = easysrc_clean->first; ptr; ptr = ptr->next)
|
|
curl_mfprintf(out, " %s\n", ptr->data);
|
|
}
|
|
|
|
for(i = 0; ((c = srcend[i]) != NULL); i++)
|
|
curl_mfprintf(out, "%s\n", c);
|
|
|
|
if(fopened)
|
|
curlx_fclose(out);
|
|
}
|
|
|
|
easysrc_free();
|
|
}
|
|
|
|
#endif /* CURL_DISABLE_LIBCURL_OPTION */
|