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.mdCloses #12489
77 lines
2.8 KiB
C
77 lines
2.8 KiB
C
#ifndef CURLINC_MPRINTF_H
|
|
#define CURLINC_MPRINTF_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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 <stdarg.h>
|
|
#include <stdio.h> /* needed for FILE */
|
|
#include "curl.h" /* for CURL_EXTERN */
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#if (defined(__GNUC__) || defined(__clang__)) && \
|
|
defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \
|
|
!defined(CURL_NO_FMT_CHECKS)
|
|
#if defined(__MINGW32__) && !defined(__clang__)
|
|
#define CURL_TEMP_PRINTF(fmt, arg) \
|
|
__attribute__((format(gnu_printf, fmt, arg)))
|
|
#else
|
|
#define CURL_TEMP_PRINTF(fmt, arg) \
|
|
__attribute__((format(printf, fmt, arg)))
|
|
#endif
|
|
#else
|
|
#define CURL_TEMP_PRINTF(fmt, arg)
|
|
#endif
|
|
|
|
CURL_EXTERN int curl_mprintf(const char *format, ...) CURL_TEMP_PRINTF(1, 2);
|
|
CURL_EXTERN int curl_mfprintf(FILE *fd, const char *format, ...)
|
|
CURL_TEMP_PRINTF(2, 3);
|
|
CURL_EXTERN int curl_msprintf(char *buffer, const char *format, ...)
|
|
CURL_TEMP_PRINTF(2, 3);
|
|
CURL_EXTERN int curl_msnprintf(char *buffer, size_t maxlength,
|
|
const char *format, ...) CURL_TEMP_PRINTF(3, 4);
|
|
CURL_EXTERN int curl_mvprintf(const char *format, va_list args)
|
|
CURL_TEMP_PRINTF(1, 0);
|
|
CURL_EXTERN int curl_mvfprintf(FILE *fd, const char *format, va_list args)
|
|
CURL_TEMP_PRINTF(2, 0);
|
|
CURL_EXTERN int curl_mvsprintf(char *buffer, const char *format, va_list args)
|
|
CURL_TEMP_PRINTF(2, 0);
|
|
CURL_EXTERN int curl_mvsnprintf(char *buffer, size_t maxlength,
|
|
const char *format, va_list args)
|
|
CURL_TEMP_PRINTF(3, 0);
|
|
CURL_EXTERN char *curl_maprintf(const char *format, ...)
|
|
CURL_TEMP_PRINTF(1, 2);
|
|
CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args)
|
|
CURL_TEMP_PRINTF(1, 0);
|
|
|
|
#undef CURL_TEMP_PRINTF
|
|
|
|
#ifdef __cplusplus
|
|
} /* end of extern "C" */
|
|
#endif
|
|
|
|
#endif /* CURLINC_MPRINTF_H */
|