mirror of
https://github.com/curl/curl.git
synced 2024-12-21 06:50:10 +08:00
3829759bd0
https://best.openssf.org/Compiler-Hardening-Guides/Compiler-Options-Hardening-Guide-for-C-and-C++.html as of 2023-11-29 [1]. Enable new recommended warnings (except `-Wsign-conversion`): - enable `-Wformat=2` for clang (in both cmake and autotools). - add `CURL_PRINTF()` internal attribute and mark functions accepting printf arguments with it. This is a copy of existing `CURL_TEMP_PRINTF()` but using `__printf__` to make it compatible with redefinting the `printf` symbol: https://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_5.html#SEC94 - fix `CURL_PRINTF()` and existing `CURL_TEMP_PRINTF()` for mingw-w64 and enable it on this platform. - enable `-Wimplicit-fallthrough`. - enable `-Wtrampolines`. - add `-Wsign-conversion` commented with a FIXME. - cmake: enable `-pedantic-errors` the way we do it with autotools. Follow-up tod5c0351055
#2747 - lib/curl_trc.h: use `CURL_FORMAT()`, this also fixes it to enable format checks. Previously it was always disabled due to the internal `printf` macro. Fix them: - fix bug where an `set_ipv6_v6only()` call was missed in builds with `--disable-verbose` / `CURL_DISABLE_VERBOSE_STRINGS=ON`. - add internal `FALLTHROUGH()` macro. - replace obsolete fall-through comments with `FALLTHROUGH()`. - fix fallthrough markups: Delete redundant ones (showing up as warnings in most cases). Add missing ones. Fix indentation. - silence `-Wformat-nonliteral` warnings with llvm/clang. - fix one `-Wformat-nonliteral` warning. - fix new `-Wformat` and `-Wformat-security` warnings. - fix `CURL_FORMAT_SOCKET_T` value for mingw-w64. Also move its definition to `lib/curl_setup.h` allowing use in `tests/server`. - lib: fix two wrongly passed string arguments in log outputs. Co-authored-by: Jay Satiro - fix new `-Wformat` warnings on mingw-w64. [1]56c0fde389/docs/Compiler-Hardening-Guides/Compiler-Options-Hardening-Guide-for-C-and-C%2B%2B.md
Closes #12489
146 lines
4.0 KiB
C
146 lines
4.0 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 "test.h"
|
|
#include "testutil.h"
|
|
#include "testtrace.h"
|
|
#include "memdebug.h"
|
|
|
|
struct libtest_trace_cfg libtest_debug_config;
|
|
|
|
static time_t epoch_offset; /* for test time tracing */
|
|
static int known_offset; /* for test time tracing */
|
|
|
|
static
|
|
void libtest_debug_dump(const char *timebuf, const char *text, FILE *stream,
|
|
const unsigned char *ptr, size_t size, int nohex)
|
|
{
|
|
size_t i;
|
|
size_t c;
|
|
|
|
unsigned int width = 0x10;
|
|
|
|
if(nohex)
|
|
/* without the hex output, we can fit more on screen */
|
|
width = 0x40;
|
|
|
|
fprintf(stream, "%s%s, %zu bytes (0x%zx)\n", timebuf, text,
|
|
size, size);
|
|
|
|
for(i = 0; i < size; i += width) {
|
|
|
|
fprintf(stream, "%04zx: ", i);
|
|
|
|
if(!nohex) {
|
|
/* hex not disabled, show it */
|
|
for(c = 0; c < width; c++)
|
|
if(i + c < size)
|
|
fprintf(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(nohex &&
|
|
(i + c + 1 < size) && (ptr[i + c] == 0x0D) &&
|
|
(ptr[i + c + 1] == 0x0A)) {
|
|
i += (c + 2 - width);
|
|
break;
|
|
}
|
|
fprintf(stream, "%c", ((ptr[i + c] >= 0x20) && (ptr[i + c] < 0x80)) ?
|
|
ptr[i + c] : '.');
|
|
/* check again for 0D0A, to avoid an extra \n if it's at width */
|
|
if(nohex &&
|
|
(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);
|
|
}
|
|
|
|
int libtest_debug_cb(CURL *handle, curl_infotype type,
|
|
unsigned char *data, size_t size,
|
|
void *userp)
|
|
{
|
|
|
|
struct libtest_trace_cfg *trace_cfg = userp;
|
|
const char *text;
|
|
struct timeval tv;
|
|
char timebuf[20];
|
|
char *timestr;
|
|
time_t secs;
|
|
|
|
(void)handle;
|
|
|
|
timebuf[0] = '\0';
|
|
timestr = &timebuf[0];
|
|
|
|
if(trace_cfg->tracetime) {
|
|
struct tm *now;
|
|
tv = tutil_tvnow();
|
|
if(!known_offset) {
|
|
epoch_offset = time(NULL) - tv.tv_sec;
|
|
known_offset = 1;
|
|
}
|
|
secs = epoch_offset + tv.tv_sec;
|
|
now = localtime(&secs); /* not thread safe but we don't care */
|
|
msnprintf(timebuf, sizeof(timebuf), "%02d:%02d:%02d.%06ld ",
|
|
now->tm_hour, now->tm_min, now->tm_sec, (long)tv.tv_usec);
|
|
}
|
|
|
|
switch(type) {
|
|
case CURLINFO_TEXT:
|
|
fprintf(stderr, "%s== Info: %s", timestr, (char *)data);
|
|
return 0;
|
|
case CURLINFO_HEADER_OUT:
|
|
text = "=> Send header";
|
|
break;
|
|
case CURLINFO_DATA_OUT:
|
|
text = "=> Send data";
|
|
break;
|
|
case CURLINFO_SSL_DATA_OUT:
|
|
text = "=> Send SSL 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;
|
|
default: /* in case a new one is introduced to shock us */
|
|
return 0;
|
|
}
|
|
|
|
libtest_debug_dump(timebuf, text, stderr, data, size, trace_cfg->nohex);
|
|
return 0;
|
|
}
|