mirror of
https://github.com/curl/curl.git
synced 2024-12-27 06:59:43 +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
94 lines
3.6 KiB
C
94 lines
3.6 KiB
C
#ifndef HEADER_CURL_DYNBUF_H
|
|
#define HEADER_CURL_DYNBUF_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 <curl/curl.h>
|
|
|
|
#ifndef BUILDING_LIBCURL
|
|
/* this renames the functions so that the tool code can use the same code
|
|
without getting symbol collisions */
|
|
#define Curl_dyn_init(a,b) curlx_dyn_init(a,b)
|
|
#define Curl_dyn_add(a,b) curlx_dyn_add(a,b)
|
|
#define Curl_dyn_addn(a,b,c) curlx_dyn_addn(a,b,c)
|
|
#define Curl_dyn_addf curlx_dyn_addf
|
|
#define Curl_dyn_vaddf curlx_dyn_vaddf
|
|
#define Curl_dyn_free(a) curlx_dyn_free(a)
|
|
#define Curl_dyn_ptr(a) curlx_dyn_ptr(a)
|
|
#define Curl_dyn_uptr(a) curlx_dyn_uptr(a)
|
|
#define Curl_dyn_len(a) curlx_dyn_len(a)
|
|
#define Curl_dyn_reset(a) curlx_dyn_reset(a)
|
|
#define Curl_dyn_tail(a,b) curlx_dyn_tail(a,b)
|
|
#define Curl_dyn_setlen(a,b) curlx_dyn_setlen(a,b)
|
|
#define curlx_dynbuf dynbuf /* for the struct name */
|
|
#endif
|
|
|
|
struct dynbuf {
|
|
char *bufr; /* point to a null-terminated allocated buffer */
|
|
size_t leng; /* number of bytes *EXCLUDING* the null-terminator */
|
|
size_t allc; /* size of the current allocation */
|
|
size_t toobig; /* size limit for the buffer */
|
|
#ifdef DEBUGBUILD
|
|
int init; /* detect API usage mistakes */
|
|
#endif
|
|
};
|
|
|
|
void Curl_dyn_init(struct dynbuf *s, size_t toobig);
|
|
void Curl_dyn_free(struct dynbuf *s);
|
|
CURLcode Curl_dyn_addn(struct dynbuf *s, const void *mem, size_t len)
|
|
WARN_UNUSED_RESULT;
|
|
CURLcode Curl_dyn_add(struct dynbuf *s, const char *str)
|
|
WARN_UNUSED_RESULT;
|
|
CURLcode Curl_dyn_addf(struct dynbuf *s, const char *fmt, ...)
|
|
WARN_UNUSED_RESULT CURL_PRINTF(2, 3);
|
|
CURLcode Curl_dyn_vaddf(struct dynbuf *s, const char *fmt, va_list ap)
|
|
WARN_UNUSED_RESULT CURL_PRINTF(2, 0);
|
|
void Curl_dyn_reset(struct dynbuf *s);
|
|
CURLcode Curl_dyn_tail(struct dynbuf *s, size_t trail);
|
|
CURLcode Curl_dyn_setlen(struct dynbuf *s, size_t set);
|
|
char *Curl_dyn_ptr(const struct dynbuf *s);
|
|
unsigned char *Curl_dyn_uptr(const struct dynbuf *s);
|
|
size_t Curl_dyn_len(const struct dynbuf *s);
|
|
|
|
/* returns 0 on success, -1 on error */
|
|
/* The implementation of this function exists in mprintf.c */
|
|
int Curl_dyn_vprintf(struct dynbuf *dyn, const char *format, va_list ap_save);
|
|
|
|
/* Dynamic buffer max sizes */
|
|
#define DYN_DOH_RESPONSE 3000
|
|
#define DYN_DOH_CNAME 256
|
|
#define DYN_PAUSE_BUFFER (64 * 1024 * 1024)
|
|
#define DYN_HAXPROXY 2048
|
|
#define DYN_HTTP_REQUEST (1024*1024)
|
|
#define DYN_APRINTF 8000000
|
|
#define DYN_RTSP_REQ_HEADER (64*1024)
|
|
#define DYN_TRAILERS (64*1024)
|
|
#define DYN_PROXY_CONNECT_HEADERS 16384
|
|
#define DYN_QLOG_NAME 1024
|
|
#define DYN_H1_TRAILER 4096
|
|
#define DYN_PINGPPONG_CMD (64*1024)
|
|
#define DYN_IMAP_CMD (64*1024)
|
|
#define DYN_MQTT_RECV (64*1024)
|
|
#endif
|