mirror of
https://github.com/curl/curl.git
synced 2026-06-22 12:55:39 +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
284 lines
8.4 KiB
C
284 lines
8.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 "tool_setup.h"
|
|
|
|
#include "tool_cfgable.h"
|
|
#include "tool_msgs.h"
|
|
#include "tool_cb_dbg.h"
|
|
#include "tool_util.h"
|
|
|
|
static void dump(const char *timebuf, const char *idsbuf, const char *text,
|
|
FILE *stream, const unsigned char *ptr, size_t size,
|
|
trace tracetype, curl_infotype infotype);
|
|
|
|
/*
|
|
* Return the formatted HH:MM:SS for the tv_sec given.
|
|
* NOT thread safe.
|
|
*/
|
|
static const char *hms_for_sec(time_t tv_sec)
|
|
{
|
|
static time_t cached_tv_sec;
|
|
static char hms_buf[12];
|
|
|
|
if(tv_sec != cached_tv_sec) {
|
|
/* !checksrc! disable BANNEDFUNC 1 */
|
|
struct tm *now = localtime(&tv_sec); /* not thread safe either */
|
|
curl_msnprintf(hms_buf, sizeof(hms_buf), "%02d:%02d:%02d",
|
|
now->tm_hour, now->tm_min, now->tm_sec);
|
|
cached_tv_sec = tv_sec;
|
|
}
|
|
return hms_buf;
|
|
}
|
|
|
|
static void log_line_start(FILE *log, const char *timebuf,
|
|
const char *idsbuf, curl_infotype type)
|
|
{
|
|
/*
|
|
* This is the trace look that is similar to what libcurl makes on its
|
|
* own.
|
|
*/
|
|
static const char * const s_infotype[] = {
|
|
"* ", "< ", "> ", "{ ", "} ", "{ ", "} "
|
|
};
|
|
if((timebuf && *timebuf) || (idsbuf && *idsbuf))
|
|
curl_mfprintf(log, "%s%s%s", timebuf, idsbuf, s_infotype[type]);
|
|
else
|
|
fputs(s_infotype[type], log);
|
|
}
|
|
|
|
#define TRC_IDS_FORMAT_IDS_1 "[%" CURL_FORMAT_CURL_OFF_T "-x] "
|
|
#define TRC_IDS_FORMAT_IDS_2 "[%" CURL_FORMAT_CURL_OFF_T "-%" \
|
|
CURL_FORMAT_CURL_OFF_T "] "
|
|
/*
|
|
** callback for CURLOPT_DEBUGFUNCTION
|
|
*/
|
|
int tool_debug_cb(CURL *handle, curl_infotype type,
|
|
char *data, size_t size,
|
|
void *userdata)
|
|
{
|
|
FILE *output = tool_stderr;
|
|
const char *text;
|
|
struct timeval tv;
|
|
char timebuf[20];
|
|
/* largest signed 64-bit is: 9,223,372,036,854,775,807
|
|
* max length in decimal: 1 + (6*3) = 19
|
|
* formatted via TRC_IDS_FORMAT_IDS_2 this becomes 2 + 19 + 1 + 19 + 2 = 43
|
|
* negative xfer-id are not printed, negative conn-ids use TRC_IDS_FORMAT_1
|
|
*/
|
|
char idsbuf[60];
|
|
curl_off_t xfer_id, conn_id;
|
|
|
|
(void)handle;
|
|
(void)userdata;
|
|
|
|
if(global->tracetime) {
|
|
tv = tvrealnow();
|
|
curl_msnprintf(timebuf, sizeof(timebuf), "%s.%06ld ",
|
|
hms_for_sec(tv.tv_sec), (long)tv.tv_usec);
|
|
}
|
|
else
|
|
timebuf[0] = 0;
|
|
|
|
if(handle && global->traceids &&
|
|
!curl_easy_getinfo(handle, CURLINFO_XFER_ID, &xfer_id) && xfer_id >= 0) {
|
|
if(!curl_easy_getinfo(handle, CURLINFO_CONN_ID, &conn_id) &&
|
|
conn_id >= 0) {
|
|
curl_msnprintf(idsbuf, sizeof(idsbuf), TRC_IDS_FORMAT_IDS_2,
|
|
xfer_id, conn_id);
|
|
}
|
|
else {
|
|
curl_msnprintf(idsbuf, sizeof(idsbuf), TRC_IDS_FORMAT_IDS_1, xfer_id);
|
|
}
|
|
}
|
|
else
|
|
idsbuf[0] = 0;
|
|
|
|
if(!global->trace_stream) {
|
|
/* open for append */
|
|
if(!strcmp("-", global->trace_dump))
|
|
global->trace_stream = stdout;
|
|
else if(!strcmp("%", global->trace_dump))
|
|
/* Ok, this is somewhat hackish but we do it undocumented for now */
|
|
global->trace_stream = tool_stderr;
|
|
else {
|
|
global->trace_stream = curlx_fopen(global->trace_dump, FOPEN_WRITETEXT);
|
|
global->trace_fopened = TRUE;
|
|
}
|
|
}
|
|
|
|
if(global->trace_stream)
|
|
output = global->trace_stream;
|
|
|
|
if(!output) {
|
|
warnf("Failed to create/open output");
|
|
return 0;
|
|
}
|
|
|
|
if(global->tracetype == TRACE_PLAIN) {
|
|
static bool newl = FALSE;
|
|
static bool traced_data = FALSE;
|
|
|
|
switch(type) {
|
|
case CURLINFO_HEADER_OUT:
|
|
if(size > 0) {
|
|
size_t st = 0;
|
|
size_t i;
|
|
for(i = 0; i < size - 1; i++) {
|
|
if(data[i] == '\n') { /* LF */
|
|
if(!newl) {
|
|
log_line_start(output, timebuf, idsbuf, type);
|
|
}
|
|
(void)fwrite(data + st, i - st + 1, 1, output);
|
|
st = i + 1;
|
|
newl = FALSE;
|
|
}
|
|
}
|
|
if(!newl)
|
|
log_line_start(output, timebuf, idsbuf, type);
|
|
(void)fwrite(data + st, i - st + 1, 1, output);
|
|
}
|
|
newl = (size && (data[size - 1] != '\n'));
|
|
traced_data = FALSE;
|
|
break;
|
|
case CURLINFO_TEXT:
|
|
case CURLINFO_HEADER_IN:
|
|
if(!newl)
|
|
log_line_start(output, timebuf, idsbuf, type);
|
|
(void)fwrite(data, size, 1, output);
|
|
newl = (size && (data[size - 1] != '\n'));
|
|
traced_data = FALSE;
|
|
break;
|
|
case CURLINFO_DATA_OUT:
|
|
case CURLINFO_DATA_IN:
|
|
case CURLINFO_SSL_DATA_IN:
|
|
case CURLINFO_SSL_DATA_OUT:
|
|
if(!traced_data) {
|
|
/* if the data is output to a tty and we are sending this debug trace
|
|
to stderr or stdout, we do not display the alert about the data not
|
|
being shown as the data _is_ shown then just not via this
|
|
function */
|
|
if(!global->isatty ||
|
|
((output != tool_stderr) && (output != stdout))) {
|
|
if(!newl)
|
|
log_line_start(output, timebuf, idsbuf, type);
|
|
curl_mfprintf(output, "[%zu bytes data]\n", size);
|
|
newl = FALSE;
|
|
traced_data = TRUE;
|
|
}
|
|
}
|
|
break;
|
|
default: /* nada */
|
|
newl = FALSE;
|
|
traced_data = FALSE;
|
|
break;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
switch(type) {
|
|
case CURLINFO_TEXT:
|
|
curl_mfprintf(output, "%s%s* %.*s", timebuf, idsbuf, (int)size, data);
|
|
FALLTHROUGH();
|
|
default: /* in case a new one is introduced to shock us */
|
|
return 0;
|
|
|
|
case CURLINFO_HEADER_OUT:
|
|
text = "=> Send header";
|
|
break;
|
|
case CURLINFO_DATA_OUT:
|
|
text = "=> Send data";
|
|
break;
|
|
case CURLINFO_HEADER_IN:
|
|
text = "<= Recv header";
|
|
break;
|
|
case CURLINFO_DATA_IN:
|
|
text = "<= Recv data";
|
|
break;
|
|
case CURLINFO_SSL_DATA_IN:
|
|
text = "<= Recv SSL data";
|
|
break;
|
|
case CURLINFO_SSL_DATA_OUT:
|
|
text = "=> Send SSL data";
|
|
break;
|
|
}
|
|
|
|
dump(timebuf, idsbuf, text, output, (unsigned char *) data, size,
|
|
global->tracetype, type);
|
|
return 0;
|
|
}
|
|
|
|
static void dump(const char *timebuf, const char *idsbuf, const char *text,
|
|
FILE *stream, const unsigned char *ptr, size_t size,
|
|
trace tracetype, curl_infotype infotype)
|
|
{
|
|
size_t i;
|
|
size_t c;
|
|
|
|
unsigned int width = 0x10;
|
|
|
|
if(tracetype == TRACE_ASCII)
|
|
/* without the hex output, we can fit more on screen */
|
|
width = 0x40;
|
|
|
|
curl_mfprintf(stream, "%s%s%s, %zu bytes (0x%zx)\n", timebuf, idsbuf,
|
|
text, size, size);
|
|
|
|
for(i = 0; i < size; i += width) {
|
|
|
|
curl_mfprintf(stream, "%04zx: ", i);
|
|
|
|
if(tracetype == TRACE_BIN) {
|
|
/* hex not disabled, show it */
|
|
for(c = 0; c < width; c++)
|
|
if(i + c < size)
|
|
curl_mfprintf(stream, "%02x ", ptr[i + c]);
|
|
else
|
|
fputs(" ", stream);
|
|
}
|
|
|
|
for(c = 0; (c < width) && (i + c < size); c++) {
|
|
/* check for 0D0A; if found, skip past and start a new line of output */
|
|
if((tracetype == TRACE_ASCII) &&
|
|
(i + c + 1 < size) && (ptr[i + c] == 0x0D) &&
|
|
(ptr[i + c + 1] == 0x0A)) {
|
|
i += (c + 2 - width);
|
|
break;
|
|
}
|
|
(void)infotype;
|
|
curl_mfprintf(stream, "%c",
|
|
((ptr[i + c] >= 0x20) && (ptr[i + c] < 0x7F)) ?
|
|
ptr[i + c] : UNPRINTABLE_CHAR);
|
|
/* check again for 0D0A, to avoid an extra \n if it is at width */
|
|
if((tracetype == TRACE_ASCII) &&
|
|
(i + c + 2 < size) && (ptr[i + c + 1] == 0x0D) &&
|
|
(ptr[i + c + 2] == 0x0A)) {
|
|
i += (c + 3 - width);
|
|
break;
|
|
}
|
|
}
|
|
fputc('\n', stream); /* newline */
|
|
}
|
|
fflush(stream);
|
|
}
|