mirror of
https://github.com/curl/curl.git
synced 2024-12-09 06:30:06 +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.mdCloses #12489
203 lines
7.8 KiB
C
203 lines
7.8 KiB
C
#ifndef HEADER_CURL_MEMDEBUG_H
|
|
#define HEADER_CURL_MEMDEBUG_H
|
|
#ifdef CURLDEBUG
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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
|
|
*
|
|
***************************************************************************/
|
|
|
|
/*
|
|
* CAUTION: this header is designed to work when included by the app-side
|
|
* as well as the library. Do not mix with library internals!
|
|
*/
|
|
|
|
#include <curl/curl.h>
|
|
#include "functypes.h"
|
|
|
|
#if defined(__GNUC__) && __GNUC__ >= 3
|
|
# define ALLOC_FUNC __attribute__((malloc))
|
|
# define ALLOC_SIZE(s) __attribute__((alloc_size(s)))
|
|
# define ALLOC_SIZE2(n, s) __attribute__((alloc_size(n, s)))
|
|
#elif defined(_MSC_VER)
|
|
# define ALLOC_FUNC __declspec(restrict)
|
|
# define ALLOC_SIZE(s)
|
|
# define ALLOC_SIZE2(n, s)
|
|
#else
|
|
# define ALLOC_FUNC
|
|
# define ALLOC_SIZE(s)
|
|
# define ALLOC_SIZE2(n, s)
|
|
#endif
|
|
|
|
#define CURL_MT_LOGFNAME_BUFSIZE 512
|
|
|
|
extern FILE *curl_dbg_logfile;
|
|
|
|
/* memory functions */
|
|
CURL_EXTERN ALLOC_FUNC ALLOC_SIZE(1) void *curl_dbg_malloc(size_t size,
|
|
int line,
|
|
const char *source);
|
|
CURL_EXTERN ALLOC_FUNC ALLOC_SIZE2(1, 2) void *curl_dbg_calloc(size_t elements,
|
|
size_t size, int line, const char *source);
|
|
CURL_EXTERN ALLOC_SIZE(2) void *curl_dbg_realloc(void *ptr,
|
|
size_t size,
|
|
int line,
|
|
const char *source);
|
|
CURL_EXTERN void curl_dbg_free(void *ptr, int line, const char *source);
|
|
CURL_EXTERN ALLOC_FUNC char *curl_dbg_strdup(const char *str, int line,
|
|
const char *src);
|
|
#if defined(_WIN32) && defined(UNICODE)
|
|
CURL_EXTERN ALLOC_FUNC wchar_t *curl_dbg_wcsdup(const wchar_t *str,
|
|
int line,
|
|
const char *source);
|
|
#endif
|
|
|
|
CURL_EXTERN void curl_dbg_memdebug(const char *logname);
|
|
CURL_EXTERN void curl_dbg_memlimit(long limit);
|
|
CURL_EXTERN void curl_dbg_log(const char *format, ...) CURL_PRINTF(1, 2);
|
|
|
|
/* file descriptor manipulators */
|
|
CURL_EXTERN curl_socket_t curl_dbg_socket(int domain, int type, int protocol,
|
|
int line, const char *source);
|
|
CURL_EXTERN void curl_dbg_mark_sclose(curl_socket_t sockfd,
|
|
int line, const char *source);
|
|
CURL_EXTERN int curl_dbg_sclose(curl_socket_t sockfd,
|
|
int line, const char *source);
|
|
CURL_EXTERN curl_socket_t curl_dbg_accept(curl_socket_t s, void *a, void *alen,
|
|
int line, const char *source);
|
|
#ifdef HAVE_SOCKETPAIR
|
|
CURL_EXTERN int curl_dbg_socketpair(int domain, int type, int protocol,
|
|
curl_socket_t socket_vector[2],
|
|
int line, const char *source);
|
|
#endif
|
|
|
|
/* send/receive sockets */
|
|
CURL_EXTERN SEND_TYPE_RETV curl_dbg_send(SEND_TYPE_ARG1 sockfd,
|
|
SEND_QUAL_ARG2 SEND_TYPE_ARG2 buf,
|
|
SEND_TYPE_ARG3 len,
|
|
SEND_TYPE_ARG4 flags, int line,
|
|
const char *source);
|
|
CURL_EXTERN RECV_TYPE_RETV curl_dbg_recv(RECV_TYPE_ARG1 sockfd,
|
|
RECV_TYPE_ARG2 buf,
|
|
RECV_TYPE_ARG3 len,
|
|
RECV_TYPE_ARG4 flags, int line,
|
|
const char *source);
|
|
|
|
/* FILE functions */
|
|
CURL_EXTERN ALLOC_FUNC FILE *curl_dbg_fopen(const char *file, const char *mode,
|
|
int line, const char *source);
|
|
CURL_EXTERN ALLOC_FUNC FILE *curl_dbg_fdopen(int filedes, const char *mode,
|
|
int line, const char *source);
|
|
|
|
CURL_EXTERN int curl_dbg_fclose(FILE *file, int line, const char *source);
|
|
|
|
#ifndef MEMDEBUG_NODEFINES
|
|
|
|
/* Set this symbol on the command-line, recompile all lib-sources */
|
|
#undef strdup
|
|
#define strdup(ptr) curl_dbg_strdup(ptr, __LINE__, __FILE__)
|
|
#define malloc(size) curl_dbg_malloc(size, __LINE__, __FILE__)
|
|
#define calloc(nbelem,size) curl_dbg_calloc(nbelem, size, __LINE__, __FILE__)
|
|
#define realloc(ptr,size) curl_dbg_realloc(ptr, size, __LINE__, __FILE__)
|
|
#define free(ptr) curl_dbg_free(ptr, __LINE__, __FILE__)
|
|
#define send(a,b,c,d) curl_dbg_send(a,b,c,d, __LINE__, __FILE__)
|
|
#define recv(a,b,c,d) curl_dbg_recv(a,b,c,d, __LINE__, __FILE__)
|
|
|
|
#ifdef _WIN32
|
|
# ifdef UNICODE
|
|
# undef wcsdup
|
|
# define wcsdup(ptr) curl_dbg_wcsdup(ptr, __LINE__, __FILE__)
|
|
# undef _wcsdup
|
|
# define _wcsdup(ptr) curl_dbg_wcsdup(ptr, __LINE__, __FILE__)
|
|
# undef _tcsdup
|
|
# define _tcsdup(ptr) curl_dbg_wcsdup(ptr, __LINE__, __FILE__)
|
|
# else
|
|
# undef _tcsdup
|
|
# define _tcsdup(ptr) curl_dbg_strdup(ptr, __LINE__, __FILE__)
|
|
# endif
|
|
#endif
|
|
|
|
#undef socket
|
|
#define socket(domain,type,protocol)\
|
|
curl_dbg_socket(domain, type, protocol, __LINE__, __FILE__)
|
|
#undef accept /* for those with accept as a macro */
|
|
#define accept(sock,addr,len)\
|
|
curl_dbg_accept(sock, addr, len, __LINE__, __FILE__)
|
|
#ifdef HAVE_SOCKETPAIR
|
|
#define socketpair(domain,type,protocol,socket_vector)\
|
|
curl_dbg_socketpair(domain, type, protocol, socket_vector, __LINE__, __FILE__)
|
|
#endif
|
|
|
|
#ifdef HAVE_GETADDRINFO
|
|
#if defined(getaddrinfo) && defined(__osf__)
|
|
/* OSF/1 and Tru64 have getaddrinfo as a define already, so we cannot define
|
|
our macro as for other platforms. Instead, we redefine the new name they
|
|
define getaddrinfo to become! */
|
|
#define ogetaddrinfo(host,serv,hint,res) \
|
|
curl_dbg_getaddrinfo(host, serv, hint, res, __LINE__, __FILE__)
|
|
#else
|
|
#undef getaddrinfo
|
|
#define getaddrinfo(host,serv,hint,res) \
|
|
curl_dbg_getaddrinfo(host, serv, hint, res, __LINE__, __FILE__)
|
|
#endif
|
|
#endif /* HAVE_GETADDRINFO */
|
|
|
|
#ifdef HAVE_FREEADDRINFO
|
|
#undef freeaddrinfo
|
|
#define freeaddrinfo(data) \
|
|
curl_dbg_freeaddrinfo(data, __LINE__, __FILE__)
|
|
#endif /* HAVE_FREEADDRINFO */
|
|
|
|
/* sclose is probably already defined, redefine it! */
|
|
#undef sclose
|
|
#define sclose(sockfd) curl_dbg_sclose(sockfd,__LINE__,__FILE__)
|
|
|
|
#define fake_sclose(sockfd) curl_dbg_mark_sclose(sockfd,__LINE__,__FILE__)
|
|
|
|
#undef fopen
|
|
#define fopen(file,mode) curl_dbg_fopen(file,mode,__LINE__,__FILE__)
|
|
#undef fdopen
|
|
#define fdopen(file,mode) curl_dbg_fdopen(file,mode,__LINE__,__FILE__)
|
|
#define fclose(file) curl_dbg_fclose(file,__LINE__,__FILE__)
|
|
|
|
#endif /* MEMDEBUG_NODEFINES */
|
|
|
|
#endif /* CURLDEBUG */
|
|
|
|
/*
|
|
** Following section applies even when CURLDEBUG is not defined.
|
|
*/
|
|
|
|
#ifndef fake_sclose
|
|
#define fake_sclose(x) Curl_nop_stmt
|
|
#endif
|
|
|
|
/*
|
|
* Curl_safefree defined as a macro to allow MemoryTracking feature
|
|
* to log free() calls at same location where Curl_safefree is used.
|
|
* This macro also assigns NULL to given pointer when free'd.
|
|
*/
|
|
|
|
#define Curl_safefree(ptr) \
|
|
do { free((ptr)); (ptr) = NULL;} while(0)
|
|
|
|
#endif /* HEADER_CURL_MEMDEBUG_H */
|