mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-03-07 15:27:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
eed3c8f4b7
curl/lib/memdebug.h

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

212 lines
8.0 KiB
C
Raw Normal View History

stdio.h, stdlib.h, string.h, stdarg.h and ctype.h inclusion done in setup_once.h
2011-07-26 23:23:27 +08:00
#ifndef HEADER_CURL_MEMDEBUG_H
#define HEADER_CURL_MEMDEBUG_H
MemoryTracking: fix logging of free() calls done where Curl_safefree is called Just internal stuff... Curl_safefree is now a macro defined in memdebug.h instead of a function prototyped in url.h and implemented in url.c, so inclusion of url.h is no longer required in order to simply use Curl_safefree. Provide definition of macro WHILE_FALSE in setup_once.h in order to allow other macros such as DEBUGF and DEBUGASSERT, and code using it, to compile without 'conditional expression is constant' warnings. The WHILE_FALSE stuff fixes 150+ MSVC compiler warnings.
2011-09-03 01:40:53 +08:00
#ifdef CURLDEBUG
updated source code boilerplate/header
2002-09-03 19:52:59 +08:00
/***************************************************************************
Changes for removing libcurl.def file on Win32. Added "CURL_EXTERN" to memdebug.h functions. Cleaned up Makefile.vc6.
2004-11-09 22:00:56 +08:00
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
copyright string (year) update
2002-03-19 15:54:55 +08:00
* \___|\___/|_| \_\_____|
*
copyright: update all copyright lines and remove year ranges - they are mostly pointless in all major jurisdictions - many big corporations and projects already don't use them - saves us from pointless churn - git keeps history for us - the year range is kept in COPYING checksrc is updated to allow non-year using copyright statements Closes #10205
2023-01-02 20:51:48 +08:00
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
copyright string (year) update
2002-03-19 15:54:55 +08:00
*
updated source code boilerplate/header
2002-09-03 19:52:59 +08:00
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
curl.se: new home Closes #6172
2020-11-04 21:02:01 +08:00
* are also available at https://curl.se/docs/copyright.html.
Changes for removing libcurl.def file on Win32. Added "CURL_EXTERN" to memdebug.h functions. Cleaned up Makefile.vc6.
2004-11-09 22:00:56 +08:00
*
copyright string (year) update
2002-03-19 15:54:55 +08:00
* 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
updated source code boilerplate/header
2002-09-03 19:52:59 +08:00
* furnished to do so, under the terms of the COPYING file.
copyright string (year) update
2002-03-19 15:54:55 +08:00
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
MemoryTracking: fix logging of free() calls done where Curl_safefree is called Just internal stuff... Curl_safefree is now a macro defined in memdebug.h instead of a function prototyped in url.h and implemented in url.c, so inclusion of url.h is no longer required in order to simply use Curl_safefree. Provide definition of macro WHILE_FALSE in setup_once.h in order to allow other macros such as DEBUGF and DEBUGASSERT, and code using it, to compile without 'conditional expression is constant' warnings. The WHILE_FALSE stuff fixes 150+ MSVC compiler warnings.
2011-09-03 01:40:53 +08:00
* SPDX-License-Identifier: curl
copyright: make repository REUSE compliant Add licensing and copyright information for all files in this repository. This either happens in the file itself as a comment header or in the file `.reuse/dep5`. This commit also adds a Github workflow to check pull requests and adapts copyright.pl to the changes. Closes #8869
2022-05-17 17:16:50 +08:00
*
updated source code boilerplate/header
2002-09-03 19:52:59 +08:00
***************************************************************************/
Added fopen() and fclose() leak tracking
2000-12-19 21:23:54 +08:00
Modified curl_accept() to take a 'void *' in the 2nd argument instead of sockaddr *. This has the added benefit that source files that include memdebug.h doesn't have to know about "sockaddr".
2004-02-18 20:18:33 +08:00
/*
* CAUTION: this header is designed to work when included by the app-side
* as well as the library. Do not mix with library internals!
*/
lib and tests: add missing curl.h includes Closes https://github.com/curl/curl/pull/9453
2022-09-07 18:19:29 +08:00
#include <curl/curl.h>
functypes: provide the recv and send arg and return types This header is for providing the argument types for recv() and send() when built to not use a dedicated config-[platfor].h file. Remove the slow brute-force checks from configure and cmake. This change also removes the use of the types for select, as they were not used in code. Closes #9592
2022-09-26 17:45:18 +08:00
#include "functypes.h"
lib and tests: add missing curl.h includes Closes https://github.com/curl/curl/pull/9453
2022-09-07 18:19:29 +08:00
memdebug: add annotation attributes memory debug tracking annotates whether the returned pointer does not `alias`, hints where the size required is, for Windows to be better debugged via Visual Studio. Closes https://github.com/curl/curl/pull/9306
2022-08-13 22:17:12 +08:00
#if defined(__GNUC__) && __GNUC__ >= 3
lib: fix AIX build issues - memdebug: replace keyword `malloc` with `__malloc__` to not interfere with envs where `malloc` is redefined. Also apply the fix to `alloc_size`. Fixes: ``` lib/memdebug.h:107:13: warning: unknown attribute 'vec_malloc' ignored [-Wunknown-attributes] CURL_EXTERN ALLOC_FUNC FILE *curl_dbg_fdopen(int filedes, const char *mode, ^~~~~~~~~~ lib/memdebug.h:37:37: note: expanded from macro 'ALLOC_FUNC' # define ALLOC_FUNC __attribute__((malloc)) ^~~~~~ /usr/include/stdlib.h:753:16: note: expanded from macro 'malloc' #define malloc vec_malloc ^~~~~~~~~~ ``` - memdebug: always undef before defining. Also do this for the rest of functions redefined in the same block. Avoids warning on AIX: ``` lib/memdebug.h:117:9: warning: 'malloc' macro redefined [-Wmacro-redefined] #define malloc(size) curl_dbg_malloc(size, __LINE__, __FILE__) ^ /usr/include/stdlib.h:753:9: note: previous definition is here #define malloc vec_malloc ^ ``` - easy: fix `-Wformat` warning on AIX by adding a cast. ``` lib/easy.c:608:47: warning: format specifies type 'int' but the argument has type 'long' [-Wformat] "%" CURL_FORMAT_SOCKET_T ")", fds[i].fd); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~ ``` - if2ip: silence compiler warning inside AIX system header. ``` /lib/if2ip.c:219:19: warning: signed shift result (0x80000000) sets the sign bit of the shift expression's type ('int') and becomes negative [-Wshift-sign-overflow] if(ioctl(dummy, SIOCGIFADDR, &req) < 0) { ^~~~~~~~~~~ /usr/include/sys/ioctl.h:401:26: note: expanded from macro 'SIOCGIFADDR' #define SIOCGIFADDR (int)_IOWR('i',33, struct oifreq) /* get ifnet address */ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/sys/ioctl.h:174:23: note: expanded from macro '_IOWR' #define _IOWR(x,y,t) (IOC_INOUT|((sizeof(t)&IOCPARM_MASK)<<16)|(x<<8)|y) ^~~~~~~~~ /usr/include/sys/ioctl.h:168:20: note: expanded from macro 'IOC_INOUT' #define IOC_INOUT (IOC_IN|IOC_OUT) ^~~~~~ /usr/include/sys/ioctl.h:167:28: note: expanded from macro 'IOC_IN' #define IOC_IN (0x40000000<<1) /* copy in parameters */ ~~~~~~~~~~^ ~ ``` Ref: https://curl.se/dev/log.cgi?id=20240808180420-3809007 Assisted-by: Dan Fandrich Closes #14464
2024-08-09 04:31:24 +08:00
# define ALLOC_FUNC __attribute__((__malloc__))
# define ALLOC_SIZE(s) __attribute__((__alloc_size__(s)))
# define ALLOC_SIZE2(n, s) __attribute__((__alloc_size__(n, s)))
memdebug: add annotation attributes memory debug tracking annotates whether the returned pointer does not `alias`, hints where the size required is, for Windows to be better debugged via Visual Studio. Closes https://github.com/curl/curl/pull/9306
2022-08-13 22:17:12 +08:00
#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
MemoryTracking: adjust initialization calling Calling of curl_memdebug() was still done with a pending free()
2011-08-20 23:26:02 +08:00
#define CURL_MT_LOGFNAME_BUFSIZE 512
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
extern FILE *curl_dbg_logfile;
getaddrinfo() cleanups
2001-10-04 21:25:12 +08:00
added socket() / sclose() checks to the memdebug system
2000-12-14 23:56:59 +08:00
/* memory functions */
memdebug: add annotation attributes memory debug tracking annotates whether the returned pointer does not `alias`, hints where the size required is, for Windows to be better debugged via Visual Studio. Closes https://github.com/curl/curl/pull/9306
2022-08-13 22:17:12 +08:00
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);
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
CURL_EXTERN void curl_dbg_free(void *ptr, int line, const char *source);
memdebug: add annotation attributes memory debug tracking annotates whether the returned pointer does not `alias`, hints where the size required is, for Windows to be better debugged via Visual Studio. Closes https://github.com/curl/curl/pull/9306
2022-08-13 22:17:12 +08:00
CURL_EXTERN ALLOC_FUNC char *curl_dbg_strdup(const char *str, int line,
const char *src);
windows: use built-in `_WIN32` macro to detect Windows Windows compilers define `_WIN32` automatically. Windows SDK headers or build env defines `WIN32`, or we have to take care of it. The agreement seems to be that `_WIN32` is the preferred practice here. Make the source code rely on that to detect we're building for Windows. Public `curl.h` was using `WIN32`, `__WIN32__` and `CURL_WIN32` for Windows detection, next to the official `_WIN32`. After this patch it only uses `_WIN32` for this. Also, make it stop defining `CURL_WIN32`. There is a slight chance these break compatibility with Windows compilers that fail to define `_WIN32`. I'm not aware of any obsolete or modern compiler affected, but in case there is one, one possible solution is to define this macro manually. grepping for `WIN32` remains useful to discover Windows-specific code. Also: - extend `checksrc` to ensure we're not using `WIN32` anymore. - apply minor formatting here and there. - delete unnecessary checks for `!MSDOS` when `_WIN32` is present. Co-authored-by: Jay Satiro Reviewed-by: Daniel Stenberg Closes #12376
2023-11-22 00:54:49 +08:00
#if defined(_WIN32) && defined(UNICODE)
memdebug: add annotation attributes memory debug tracking annotates whether the returned pointer does not `alias`, hints where the size required is, for Windows to be better debugged via Visual Studio. Closes https://github.com/curl/curl/pull/9306
2022-08-13 22:17:12 +08:00
CURL_EXTERN ALLOC_FUNC wchar_t *curl_dbg_wcsdup(const wchar_t *str,
int line,
const char *source);
Reinstate "WIN32 MemoryTracking: track wcsdup() _wcsdup() and _tcsdup() usage". This reverts commit 7ed25cc, reinstating commit 8ec2cb5. As of 18-jul-2013 we still do have code in libcurl that makes use of these memory functions. Commit 8ec2cb5 comment still applies and is yet valid. These memory functions are solely used in Windows builds, so all related code is protected with '#ifdef WIN32' preprocessor conditional compilation directives. Specifically, wcsdup() _wcsdup() are used when building a Windows target with UNICODE and USE_WINDOWS_SSPI preprocessor symbols defined. This is the case when building a Windows UNICODE target with Windows native SSL/TLS support enabled. Realizing that wcsdup() _wcsdup() are used is a bit tricky given that usage of these is hidden behind _tcsdup() which is MS way of dealing with code that must tolerate UNICODE and non-UNICODE compilation. Additionally, MS header files and those compatible from other compilers use this preprocessor conditional compilation directive in order to select at compilation time whether 'wide' or 'ansi' MS API functions are used. Without this code, Windows build targets with Windows native SSL/TLS support enabled and MemoryTracking support enabled misbehave in tracking memory usage, regardless of being a UNICODE enabled build or not.
2013-07-19 02:04:02 +08:00
#endif
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
CURL_EXTERN void curl_dbg_memdebug(const char *logname);
CURL_EXTERN void curl_dbg_memlimit(long limit);
build: enable missing OpenSSF-recommended warnings, with fixes 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 to d5c0351055d5709da8f3e16c91348092fdb481aa #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] https://github.com/ossf/wg-best-practices-os-developers/blob/56c0fde3895bfc55c8a973ef49a2572c507b2ae1/docs/Compiler-Hardening-Guides/Compiler-Options-Hardening-Guide-for-C-and-C%2B%2B.md Closes #12489
2023-12-08 21:05:09 +08:00
CURL_EXTERN void curl_dbg_log(const char *format, ...) CURL_PRINTF(1, 2);
added for memory leak debugging etc
2000-10-09 19:11:43 +08:00
added socket() / sclose() checks to the memdebug system
2000-12-14 23:56:59 +08:00
/* file descriptor manipulators */
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
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,
code: style updates
2016-04-04 02:28:34 +08:00
int line, const char *source);
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
CURL_EXTERN int curl_dbg_sclose(curl_socket_t sockfd,
code: style updates
2016-04-04 02:28:34 +08:00
int line, const char *source);
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
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);
socketpair() usage tracking to allow fd leak detection
2011-07-29 19:25:52 +08:00
#endif
added socket() / sclose() checks to the memdebug system
2000-12-14 23:56:59 +08:00
memdebug: trace send, recv and socket ... to allow them to be included in torture tests too. closes #1980
2017-10-10 22:56:35 +08:00
/* send/receive sockets */
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
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);
memdebug: trace send, recv and socket ... to allow them to be included in torture tests too. closes #1980
2017-10-10 22:56:35 +08:00
Added fopen() and fclose() leak tracking
2000-12-19 21:23:54 +08:00
/* FILE functions */
memdebug: add annotation attributes memory debug tracking annotates whether the returned pointer does not `alias`, hints where the size required is, for Windows to be better debugged via Visual Studio. Closes https://github.com/curl/curl/pull/9306
2022-08-13 22:17:12 +08:00
CURL_EXTERN ALLOC_FUNC FILE *curl_dbg_fopen(const char *file, const char *mode,
curl: improve the existing file check with -J Previously a file that isn't user-readable but is user-writable would not be properly avoided and would get overwritten. Reported-by: BrumBrum on hackerone Assisted-by: Jay Satiro Bug: https://hackerone.com/reports/926638 Closes #5731
2020-07-27 18:44:19 +08:00
int line, const char *source);
memdebug: add annotation attributes memory debug tracking annotates whether the returned pointer does not `alias`, hints where the size required is, for Windows to be better debugged via Visual Studio. Closes https://github.com/curl/curl/pull/9306
2022-08-13 22:17:12 +08:00
CURL_EXTERN ALLOC_FUNC FILE *curl_dbg_fdopen(int filedes, const char *mode,
int line, const char *source);
curl: improve the existing file check with -J Previously a file that isn't user-readable but is user-writable would not be properly avoided and would get overwritten. Reported-by: BrumBrum on hackerone Assisted-by: Jay Satiro Bug: https://hackerone.com/reports/926638 Closes #5731
2020-07-27 18:44:19 +08:00
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
CURL_EXTERN int curl_dbg_fclose(FILE *file, int line, const char *source);
Added fopen() and fclose() leak tracking
2000-12-19 21:23:54 +08:00
Dan Fandrich's cleanup patch to make pedantic compiler options cause less warnings. Minor edits by me.
2004-01-29 21:56:45 +08:00
#ifndef MEMDEBUG_NODEFINES
added for memory leak debugging etc
2000-10-09 19:11:43 +08:00
/* Set this symbol on the command-line, recompile all lib-sources */
prevent compiler warnings
2002-10-29 03:20:59 +08:00
#undef strdup
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
#define strdup(ptr) curl_dbg_strdup(ptr, __LINE__, __FILE__)
lib: fix AIX build issues - memdebug: replace keyword `malloc` with `__malloc__` to not interfere with envs where `malloc` is redefined. Also apply the fix to `alloc_size`. Fixes: ``` lib/memdebug.h:107:13: warning: unknown attribute 'vec_malloc' ignored [-Wunknown-attributes] CURL_EXTERN ALLOC_FUNC FILE *curl_dbg_fdopen(int filedes, const char *mode, ^~~~~~~~~~ lib/memdebug.h:37:37: note: expanded from macro 'ALLOC_FUNC' # define ALLOC_FUNC __attribute__((malloc)) ^~~~~~ /usr/include/stdlib.h:753:16: note: expanded from macro 'malloc' #define malloc vec_malloc ^~~~~~~~~~ ``` - memdebug: always undef before defining. Also do this for the rest of functions redefined in the same block. Avoids warning on AIX: ``` lib/memdebug.h:117:9: warning: 'malloc' macro redefined [-Wmacro-redefined] #define malloc(size) curl_dbg_malloc(size, __LINE__, __FILE__) ^ /usr/include/stdlib.h:753:9: note: previous definition is here #define malloc vec_malloc ^ ``` - easy: fix `-Wformat` warning on AIX by adding a cast. ``` lib/easy.c:608:47: warning: format specifies type 'int' but the argument has type 'long' [-Wformat] "%" CURL_FORMAT_SOCKET_T ")", fds[i].fd); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~ ``` - if2ip: silence compiler warning inside AIX system header. ``` /lib/if2ip.c:219:19: warning: signed shift result (0x80000000) sets the sign bit of the shift expression's type ('int') and becomes negative [-Wshift-sign-overflow] if(ioctl(dummy, SIOCGIFADDR, &req) < 0) { ^~~~~~~~~~~ /usr/include/sys/ioctl.h:401:26: note: expanded from macro 'SIOCGIFADDR' #define SIOCGIFADDR (int)_IOWR('i',33, struct oifreq) /* get ifnet address */ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/sys/ioctl.h:174:23: note: expanded from macro '_IOWR' #define _IOWR(x,y,t) (IOC_INOUT|((sizeof(t)&IOCPARM_MASK)<<16)|(x<<8)|y) ^~~~~~~~~ /usr/include/sys/ioctl.h:168:20: note: expanded from macro 'IOC_INOUT' #define IOC_INOUT (IOC_IN|IOC_OUT) ^~~~~~ /usr/include/sys/ioctl.h:167:28: note: expanded from macro 'IOC_IN' #define IOC_IN (0x40000000<<1) /* copy in parameters */ ~~~~~~~~~~^ ~ ``` Ref: https://curl.se/dev/log.cgi?id=20240808180420-3809007 Assisted-by: Dan Fandrich Closes #14464
2024-08-09 04:31:24 +08:00
#undef malloc
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
#define malloc(size) curl_dbg_malloc(size, __LINE__, __FILE__)
lib: fix AIX build issues - memdebug: replace keyword `malloc` with `__malloc__` to not interfere with envs where `malloc` is redefined. Also apply the fix to `alloc_size`. Fixes: ``` lib/memdebug.h:107:13: warning: unknown attribute 'vec_malloc' ignored [-Wunknown-attributes] CURL_EXTERN ALLOC_FUNC FILE *curl_dbg_fdopen(int filedes, const char *mode, ^~~~~~~~~~ lib/memdebug.h:37:37: note: expanded from macro 'ALLOC_FUNC' # define ALLOC_FUNC __attribute__((malloc)) ^~~~~~ /usr/include/stdlib.h:753:16: note: expanded from macro 'malloc' #define malloc vec_malloc ^~~~~~~~~~ ``` - memdebug: always undef before defining. Also do this for the rest of functions redefined in the same block. Avoids warning on AIX: ``` lib/memdebug.h:117:9: warning: 'malloc' macro redefined [-Wmacro-redefined] #define malloc(size) curl_dbg_malloc(size, __LINE__, __FILE__) ^ /usr/include/stdlib.h:753:9: note: previous definition is here #define malloc vec_malloc ^ ``` - easy: fix `-Wformat` warning on AIX by adding a cast. ``` lib/easy.c:608:47: warning: format specifies type 'int' but the argument has type 'long' [-Wformat] "%" CURL_FORMAT_SOCKET_T ")", fds[i].fd); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~ ``` - if2ip: silence compiler warning inside AIX system header. ``` /lib/if2ip.c:219:19: warning: signed shift result (0x80000000) sets the sign bit of the shift expression's type ('int') and becomes negative [-Wshift-sign-overflow] if(ioctl(dummy, SIOCGIFADDR, &req) < 0) { ^~~~~~~~~~~ /usr/include/sys/ioctl.h:401:26: note: expanded from macro 'SIOCGIFADDR' #define SIOCGIFADDR (int)_IOWR('i',33, struct oifreq) /* get ifnet address */ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/sys/ioctl.h:174:23: note: expanded from macro '_IOWR' #define _IOWR(x,y,t) (IOC_INOUT|((sizeof(t)&IOCPARM_MASK)<<16)|(x<<8)|y) ^~~~~~~~~ /usr/include/sys/ioctl.h:168:20: note: expanded from macro 'IOC_INOUT' #define IOC_INOUT (IOC_IN|IOC_OUT) ^~~~~~ /usr/include/sys/ioctl.h:167:28: note: expanded from macro 'IOC_IN' #define IOC_IN (0x40000000<<1) /* copy in parameters */ ~~~~~~~~~~^ ~ ``` Ref: https://curl.se/dev/log.cgi?id=20240808180420-3809007 Assisted-by: Dan Fandrich Closes #14464
2024-08-09 04:31:24 +08:00
#undef calloc
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
#define calloc(nbelem,size) curl_dbg_calloc(nbelem, size, __LINE__, __FILE__)
lib: fix AIX build issues - memdebug: replace keyword `malloc` with `__malloc__` to not interfere with envs where `malloc` is redefined. Also apply the fix to `alloc_size`. Fixes: ``` lib/memdebug.h:107:13: warning: unknown attribute 'vec_malloc' ignored [-Wunknown-attributes] CURL_EXTERN ALLOC_FUNC FILE *curl_dbg_fdopen(int filedes, const char *mode, ^~~~~~~~~~ lib/memdebug.h:37:37: note: expanded from macro 'ALLOC_FUNC' # define ALLOC_FUNC __attribute__((malloc)) ^~~~~~ /usr/include/stdlib.h:753:16: note: expanded from macro 'malloc' #define malloc vec_malloc ^~~~~~~~~~ ``` - memdebug: always undef before defining. Also do this for the rest of functions redefined in the same block. Avoids warning on AIX: ``` lib/memdebug.h:117:9: warning: 'malloc' macro redefined [-Wmacro-redefined] #define malloc(size) curl_dbg_malloc(size, __LINE__, __FILE__) ^ /usr/include/stdlib.h:753:9: note: previous definition is here #define malloc vec_malloc ^ ``` - easy: fix `-Wformat` warning on AIX by adding a cast. ``` lib/easy.c:608:47: warning: format specifies type 'int' but the argument has type 'long' [-Wformat] "%" CURL_FORMAT_SOCKET_T ")", fds[i].fd); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~ ``` - if2ip: silence compiler warning inside AIX system header. ``` /lib/if2ip.c:219:19: warning: signed shift result (0x80000000) sets the sign bit of the shift expression's type ('int') and becomes negative [-Wshift-sign-overflow] if(ioctl(dummy, SIOCGIFADDR, &req) < 0) { ^~~~~~~~~~~ /usr/include/sys/ioctl.h:401:26: note: expanded from macro 'SIOCGIFADDR' #define SIOCGIFADDR (int)_IOWR('i',33, struct oifreq) /* get ifnet address */ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/sys/ioctl.h:174:23: note: expanded from macro '_IOWR' #define _IOWR(x,y,t) (IOC_INOUT|((sizeof(t)&IOCPARM_MASK)<<16)|(x<<8)|y) ^~~~~~~~~ /usr/include/sys/ioctl.h:168:20: note: expanded from macro 'IOC_INOUT' #define IOC_INOUT (IOC_IN|IOC_OUT) ^~~~~~ /usr/include/sys/ioctl.h:167:28: note: expanded from macro 'IOC_IN' #define IOC_IN (0x40000000<<1) /* copy in parameters */ ~~~~~~~~~~^ ~ ``` Ref: https://curl.se/dev/log.cgi?id=20240808180420-3809007 Assisted-by: Dan Fandrich Closes #14464
2024-08-09 04:31:24 +08:00
#undef realloc
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
#define realloc(ptr,size) curl_dbg_realloc(ptr, size, __LINE__, __FILE__)
lib: fix AIX build issues - memdebug: replace keyword `malloc` with `__malloc__` to not interfere with envs where `malloc` is redefined. Also apply the fix to `alloc_size`. Fixes: ``` lib/memdebug.h:107:13: warning: unknown attribute 'vec_malloc' ignored [-Wunknown-attributes] CURL_EXTERN ALLOC_FUNC FILE *curl_dbg_fdopen(int filedes, const char *mode, ^~~~~~~~~~ lib/memdebug.h:37:37: note: expanded from macro 'ALLOC_FUNC' # define ALLOC_FUNC __attribute__((malloc)) ^~~~~~ /usr/include/stdlib.h:753:16: note: expanded from macro 'malloc' #define malloc vec_malloc ^~~~~~~~~~ ``` - memdebug: always undef before defining. Also do this for the rest of functions redefined in the same block. Avoids warning on AIX: ``` lib/memdebug.h:117:9: warning: 'malloc' macro redefined [-Wmacro-redefined] #define malloc(size) curl_dbg_malloc(size, __LINE__, __FILE__) ^ /usr/include/stdlib.h:753:9: note: previous definition is here #define malloc vec_malloc ^ ``` - easy: fix `-Wformat` warning on AIX by adding a cast. ``` lib/easy.c:608:47: warning: format specifies type 'int' but the argument has type 'long' [-Wformat] "%" CURL_FORMAT_SOCKET_T ")", fds[i].fd); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~ ``` - if2ip: silence compiler warning inside AIX system header. ``` /lib/if2ip.c:219:19: warning: signed shift result (0x80000000) sets the sign bit of the shift expression's type ('int') and becomes negative [-Wshift-sign-overflow] if(ioctl(dummy, SIOCGIFADDR, &req) < 0) { ^~~~~~~~~~~ /usr/include/sys/ioctl.h:401:26: note: expanded from macro 'SIOCGIFADDR' #define SIOCGIFADDR (int)_IOWR('i',33, struct oifreq) /* get ifnet address */ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/sys/ioctl.h:174:23: note: expanded from macro '_IOWR' #define _IOWR(x,y,t) (IOC_INOUT|((sizeof(t)&IOCPARM_MASK)<<16)|(x<<8)|y) ^~~~~~~~~ /usr/include/sys/ioctl.h:168:20: note: expanded from macro 'IOC_INOUT' #define IOC_INOUT (IOC_IN|IOC_OUT) ^~~~~~ /usr/include/sys/ioctl.h:167:28: note: expanded from macro 'IOC_IN' #define IOC_IN (0x40000000<<1) /* copy in parameters */ ~~~~~~~~~~^ ~ ``` Ref: https://curl.se/dev/log.cgi?id=20240808180420-3809007 Assisted-by: Dan Fandrich Closes #14464
2024-08-09 04:31:24 +08:00
#undef free
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
#define free(ptr) curl_dbg_free(ptr, __LINE__, __FILE__)
lib: fix AIX build issues - memdebug: replace keyword `malloc` with `__malloc__` to not interfere with envs where `malloc` is redefined. Also apply the fix to `alloc_size`. Fixes: ``` lib/memdebug.h:107:13: warning: unknown attribute 'vec_malloc' ignored [-Wunknown-attributes] CURL_EXTERN ALLOC_FUNC FILE *curl_dbg_fdopen(int filedes, const char *mode, ^~~~~~~~~~ lib/memdebug.h:37:37: note: expanded from macro 'ALLOC_FUNC' # define ALLOC_FUNC __attribute__((malloc)) ^~~~~~ /usr/include/stdlib.h:753:16: note: expanded from macro 'malloc' #define malloc vec_malloc ^~~~~~~~~~ ``` - memdebug: always undef before defining. Also do this for the rest of functions redefined in the same block. Avoids warning on AIX: ``` lib/memdebug.h:117:9: warning: 'malloc' macro redefined [-Wmacro-redefined] #define malloc(size) curl_dbg_malloc(size, __LINE__, __FILE__) ^ /usr/include/stdlib.h:753:9: note: previous definition is here #define malloc vec_malloc ^ ``` - easy: fix `-Wformat` warning on AIX by adding a cast. ``` lib/easy.c:608:47: warning: format specifies type 'int' but the argument has type 'long' [-Wformat] "%" CURL_FORMAT_SOCKET_T ")", fds[i].fd); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~ ``` - if2ip: silence compiler warning inside AIX system header. ``` /lib/if2ip.c:219:19: warning: signed shift result (0x80000000) sets the sign bit of the shift expression's type ('int') and becomes negative [-Wshift-sign-overflow] if(ioctl(dummy, SIOCGIFADDR, &req) < 0) { ^~~~~~~~~~~ /usr/include/sys/ioctl.h:401:26: note: expanded from macro 'SIOCGIFADDR' #define SIOCGIFADDR (int)_IOWR('i',33, struct oifreq) /* get ifnet address */ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/sys/ioctl.h:174:23: note: expanded from macro '_IOWR' #define _IOWR(x,y,t) (IOC_INOUT|((sizeof(t)&IOCPARM_MASK)<<16)|(x<<8)|y) ^~~~~~~~~ /usr/include/sys/ioctl.h:168:20: note: expanded from macro 'IOC_INOUT' #define IOC_INOUT (IOC_IN|IOC_OUT) ^~~~~~ /usr/include/sys/ioctl.h:167:28: note: expanded from macro 'IOC_IN' #define IOC_IN (0x40000000<<1) /* copy in parameters */ ~~~~~~~~~~^ ~ ``` Ref: https://curl.se/dev/log.cgi?id=20240808180420-3809007 Assisted-by: Dan Fandrich Closes #14464
2024-08-09 04:31:24 +08:00
#undef send
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
#define send(a,b,c,d) curl_dbg_send(a,b,c,d, __LINE__, __FILE__)
lib: fix AIX build issues - memdebug: replace keyword `malloc` with `__malloc__` to not interfere with envs where `malloc` is redefined. Also apply the fix to `alloc_size`. Fixes: ``` lib/memdebug.h:107:13: warning: unknown attribute 'vec_malloc' ignored [-Wunknown-attributes] CURL_EXTERN ALLOC_FUNC FILE *curl_dbg_fdopen(int filedes, const char *mode, ^~~~~~~~~~ lib/memdebug.h:37:37: note: expanded from macro 'ALLOC_FUNC' # define ALLOC_FUNC __attribute__((malloc)) ^~~~~~ /usr/include/stdlib.h:753:16: note: expanded from macro 'malloc' #define malloc vec_malloc ^~~~~~~~~~ ``` - memdebug: always undef before defining. Also do this for the rest of functions redefined in the same block. Avoids warning on AIX: ``` lib/memdebug.h:117:9: warning: 'malloc' macro redefined [-Wmacro-redefined] #define malloc(size) curl_dbg_malloc(size, __LINE__, __FILE__) ^ /usr/include/stdlib.h:753:9: note: previous definition is here #define malloc vec_malloc ^ ``` - easy: fix `-Wformat` warning on AIX by adding a cast. ``` lib/easy.c:608:47: warning: format specifies type 'int' but the argument has type 'long' [-Wformat] "%" CURL_FORMAT_SOCKET_T ")", fds[i].fd); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~ ``` - if2ip: silence compiler warning inside AIX system header. ``` /lib/if2ip.c:219:19: warning: signed shift result (0x80000000) sets the sign bit of the shift expression's type ('int') and becomes negative [-Wshift-sign-overflow] if(ioctl(dummy, SIOCGIFADDR, &req) < 0) { ^~~~~~~~~~~ /usr/include/sys/ioctl.h:401:26: note: expanded from macro 'SIOCGIFADDR' #define SIOCGIFADDR (int)_IOWR('i',33, struct oifreq) /* get ifnet address */ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/sys/ioctl.h:174:23: note: expanded from macro '_IOWR' #define _IOWR(x,y,t) (IOC_INOUT|((sizeof(t)&IOCPARM_MASK)<<16)|(x<<8)|y) ^~~~~~~~~ /usr/include/sys/ioctl.h:168:20: note: expanded from macro 'IOC_INOUT' #define IOC_INOUT (IOC_IN|IOC_OUT) ^~~~~~ /usr/include/sys/ioctl.h:167:28: note: expanded from macro 'IOC_IN' #define IOC_IN (0x40000000<<1) /* copy in parameters */ ~~~~~~~~~~^ ~ ``` Ref: https://curl.se/dev/log.cgi?id=20240808180420-3809007 Assisted-by: Dan Fandrich Closes #14464
2024-08-09 04:31:24 +08:00
#undef recv
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
#define recv(a,b,c,d) curl_dbg_recv(a,b,c,d, __LINE__, __FILE__)
added socket() / sclose() checks to the memdebug system
2000-12-14 23:56:59 +08:00
windows: use built-in `_WIN32` macro to detect Windows Windows compilers define `_WIN32` automatically. Windows SDK headers or build env defines `WIN32`, or we have to take care of it. The agreement seems to be that `_WIN32` is the preferred practice here. Make the source code rely on that to detect we're building for Windows. Public `curl.h` was using `WIN32`, `__WIN32__` and `CURL_WIN32` for Windows detection, next to the official `_WIN32`. After this patch it only uses `_WIN32` for this. Also, make it stop defining `CURL_WIN32`. There is a slight chance these break compatibility with Windows compilers that fail to define `_WIN32`. I'm not aware of any obsolete or modern compiler affected, but in case there is one, one possible solution is to define this macro manually. grepping for `WIN32` remains useful to discover Windows-specific code. Also: - extend `checksrc` to ensure we're not using `WIN32` anymore. - apply minor formatting here and there. - delete unnecessary checks for `!MSDOS` when `_WIN32` is present. Co-authored-by: Jay Satiro Reviewed-by: Daniel Stenberg Closes #12376
2023-11-22 00:54:49 +08:00
#ifdef _WIN32
Reinstate "WIN32 MemoryTracking: track wcsdup() _wcsdup() and _tcsdup() usage". This reverts commit 7ed25cc, reinstating commit 8ec2cb5. As of 18-jul-2013 we still do have code in libcurl that makes use of these memory functions. Commit 8ec2cb5 comment still applies and is yet valid. These memory functions are solely used in Windows builds, so all related code is protected with '#ifdef WIN32' preprocessor conditional compilation directives. Specifically, wcsdup() _wcsdup() are used when building a Windows target with UNICODE and USE_WINDOWS_SSPI preprocessor symbols defined. This is the case when building a Windows UNICODE target with Windows native SSL/TLS support enabled. Realizing that wcsdup() _wcsdup() are used is a bit tricky given that usage of these is hidden behind _tcsdup() which is MS way of dealing with code that must tolerate UNICODE and non-UNICODE compilation. Additionally, MS header files and those compatible from other compilers use this preprocessor conditional compilation directive in order to select at compilation time whether 'wide' or 'ansi' MS API functions are used. Without this code, Windows build targets with Windows native SSL/TLS support enabled and MemoryTracking support enabled misbehave in tracking memory usage, regardless of being a UNICODE enabled build or not.
2013-07-19 02:04:02 +08:00
# ifdef UNICODE
WIN32 MemoryTracking: require UNICODE for wide strdup code support
2013-07-19 12:44:46 +08:00
# undef wcsdup
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
# define wcsdup(ptr) curl_dbg_wcsdup(ptr, __LINE__, __FILE__)
WIN32 MemoryTracking: require UNICODE for wide strdup code support
2013-07-19 12:44:46 +08:00
# undef _wcsdup
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
# define _wcsdup(ptr) curl_dbg_wcsdup(ptr, __LINE__, __FILE__)
WIN32 MemoryTracking: require UNICODE for wide strdup code support
2013-07-19 12:44:46 +08:00
# undef _tcsdup
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
# define _tcsdup(ptr) curl_dbg_wcsdup(ptr, __LINE__, __FILE__)
Reinstate "WIN32 MemoryTracking: track wcsdup() _wcsdup() and _tcsdup() usage". This reverts commit 7ed25cc, reinstating commit 8ec2cb5. As of 18-jul-2013 we still do have code in libcurl that makes use of these memory functions. Commit 8ec2cb5 comment still applies and is yet valid. These memory functions are solely used in Windows builds, so all related code is protected with '#ifdef WIN32' preprocessor conditional compilation directives. Specifically, wcsdup() _wcsdup() are used when building a Windows target with UNICODE and USE_WINDOWS_SSPI preprocessor symbols defined. This is the case when building a Windows UNICODE target with Windows native SSL/TLS support enabled. Realizing that wcsdup() _wcsdup() are used is a bit tricky given that usage of these is hidden behind _tcsdup() which is MS way of dealing with code that must tolerate UNICODE and non-UNICODE compilation. Additionally, MS header files and those compatible from other compilers use this preprocessor conditional compilation directive in order to select at compilation time whether 'wide' or 'ansi' MS API functions are used. Without this code, Windows build targets with Windows native SSL/TLS support enabled and MemoryTracking support enabled misbehave in tracking memory usage, regardless of being a UNICODE enabled build or not.
2013-07-19 02:04:02 +08:00
# else
WIN32 MemoryTracking: require UNICODE for wide strdup code support
2013-07-19 12:44:46 +08:00
# undef _tcsdup
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
# define _tcsdup(ptr) curl_dbg_strdup(ptr, __LINE__, __FILE__)
Reinstate "WIN32 MemoryTracking: track wcsdup() _wcsdup() and _tcsdup() usage". This reverts commit 7ed25cc, reinstating commit 8ec2cb5. As of 18-jul-2013 we still do have code in libcurl that makes use of these memory functions. Commit 8ec2cb5 comment still applies and is yet valid. These memory functions are solely used in Windows builds, so all related code is protected with '#ifdef WIN32' preprocessor conditional compilation directives. Specifically, wcsdup() _wcsdup() are used when building a Windows target with UNICODE and USE_WINDOWS_SSPI preprocessor symbols defined. This is the case when building a Windows UNICODE target with Windows native SSL/TLS support enabled. Realizing that wcsdup() _wcsdup() are used is a bit tricky given that usage of these is hidden behind _tcsdup() which is MS way of dealing with code that must tolerate UNICODE and non-UNICODE compilation. Additionally, MS header files and those compatible from other compilers use this preprocessor conditional compilation directive in order to select at compilation time whether 'wide' or 'ansi' MS API functions are used. Without this code, Windows build targets with Windows native SSL/TLS support enabled and MemoryTracking support enabled misbehave in tracking memory usage, regardless of being a UNICODE enabled build or not.
2013-07-19 02:04:02 +08:00
# endif
#endif
lwip: Fix compatibility issues with later versions The name of the header guard in lwIP's <lwip/opt.h> has changed from '__LWIP_OPT_H__' to 'LWIP_HDR_OPT_H' (bug #35874 in May 2015). Other fixes: - In curl_setup.h, the problem with an old PSDK doesn't apply if lwIP is used. - In memdebug.h, the 'socket' should be undefined first due to lwIP's lwip_socket() macro. - In curl_addrinfo.c lwIP's getaddrinfo() + freeaddrinfo() macros need special handling because they were undef'ed in memdebug.h. - In select.c we can't use preprocessor conditionals inside select if MSVC and select is a macro, as it is with lwIP. http://curl.haxx.se/mail/lib-2015-12/0023.html http://curl.haxx.se/mail/lib-2015-12/0024.html
2015-12-08 03:27:29 +08:00
#undef socket
added socket() / sclose() checks to the memdebug system
2000-12-14 23:56:59 +08:00
#define socket(domain,type,protocol)\
lib: tidy up types and casts Cherry-picked from #13489 Closes #13862
2024-06-03 04:30:52 +08:00
curl_dbg_socket((int)domain, type, protocol, __LINE__, __FILE__)
undef accept before defining it, since AIX 5.2 has it as a define!
2004-02-03 05:34:01 +08:00
#undef accept /* for those with accept as a macro */
fixed accept() for memory debugging
2000-12-19 00:13:37 +08:00
#define accept(sock,addr,len)\
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
curl_dbg_accept(sock, addr, len, __LINE__, __FILE__)
socketpair() usage tracking to allow fd leak detection
2011-07-29 19:25:52 +08:00
#ifdef HAVE_SOCKETPAIR
#define socketpair(domain,type,protocol,socket_vector)\
lib: tidy up types and casts Cherry-picked from #13489 Closes #13862
2024-06-03 04:30:52 +08:00
curl_dbg_socketpair((int)domain, type, protocol, socket_vector, \
__LINE__, __FILE__)
socketpair() usage tracking to allow fd leak detection
2011-07-29 19:25:52 +08:00
#endif
added socket() / sclose() checks to the memdebug system
2000-12-14 23:56:59 +08:00
cmake: allow building tests in unity mode Makes building tests noticeably faster. Apply changes/fixes/workarounds to make Unity work: - rename test variables to avoid collisions or shadowing each other when combined into single units. - add workaround to avoid applying `lib/memdebug.h` overrides to system headers declaring/defining `getaddrinfo()`/`freeaddrinfo()` for `tests/server/resolve.c`. This replaces a previous workaround that worked for that specific source. - rename test macro `CTRL` clashing with Cygwin `sys/ioctl.h`. - add include guard to `test.h`. Also: - exclude `tests/http/clients` which are all single-source. (like `docs/examples`.) Build time improvements for tests: - AppVeyor CI: - MSVC 2008, 2010: 1 minute faster (4m8s -> 2m56s, 3m19s -> 2m24s) - MSVC 2022 arm64: 3.5 minutes faster (10m18s -> 6m48s) before: https://ci.appveyor.com/project/curlorg/curl/builds/50522785 after: https://ci.appveyor.com/project/curlorg/curl/builds/50522942 - GHA: - Cygwin: 1.5 minutes faster (3m13s -> 1m43s) before: https://github.com/curl/curl/actions/runs/10681535327/job/29605384398 after: https://github.com/curl/curl/actions/runs/10680818726/job/29603130637 - Windows: before: https://github.com/curl/curl/actions/runs/10680818713 after: https://github.com/curl/curl/actions/runs/10683850187 - MSYS2, mingw-w64: 1 minute faster - MSVC: 30 seconds faster (3m17s -> 2m48s) - macOS: double speed (39s -> 18s) before: https://github.com/curl/curl/actions/runs/10680818753/job/29603133447 after: https://github.com/curl/curl/actions/runs/10683850174/job/29612914515 - Linux: almost double speed (30/31s -> 18s) before: https://github.com/curl/curl/actions/runs/10681535311/job/29605387156 after: https://github.com/curl/curl/actions/runs/10680818721/job/29603133976 - non-native: no obvious effect. before: https://github.com/curl/curl/actions/runs/10680818722 after: https://github.com/curl/curl/actions/runs/10683850187 - Old Linux: Unity mode not supported by old CMake, no effect. Closes #14765
2024-09-03 06:26:26 +08:00
#ifndef CURL_NO_GETADDRINFO_OVERRIDE
Move curl_dofreeaddrinfo() and curl_dofreeaddrinfo() implementation from lib/hostip6.c to lib/curl_addrinfo.c and prototypes from lib/hostip.h to lib/curl_addrinfo.h
2008-10-31 03:02:23 +08:00
#ifdef HAVE_GETADDRINFO
enable memory debugging on tru64 with ipv6 support by doing a little different defining, since the system headers themselves redefine getaddrinfo
2005-06-30 21:28:58 +08:00
#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) \
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
curl_dbg_getaddrinfo(host, serv, hint, res, __LINE__, __FILE__)
enable memory debugging on tru64 with ipv6 support by doing a little different defining, since the system headers themselves redefine getaddrinfo
2005-06-30 21:28:58 +08:00
#else
Yang Tse fixed compiler warnings
2005-11-14 07:53:14 +08:00
#undef getaddrinfo
getaddrinfo() cleanups
2001-10-04 21:25:12 +08:00
#define getaddrinfo(host,serv,hint,res) \
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
curl_dbg_getaddrinfo(host, serv, hint, res, __LINE__, __FILE__)
enable memory debugging on tru64 with ipv6 support by doing a little different defining, since the system headers themselves redefine getaddrinfo
2005-06-30 21:28:58 +08:00
#endif
Move curl_dofreeaddrinfo() and curl_dofreeaddrinfo() implementation from lib/hostip6.c to lib/curl_addrinfo.c and prototypes from lib/hostip.h to lib/curl_addrinfo.h
2008-10-31 03:02:23 +08:00
#endif /* HAVE_GETADDRINFO */
Test HAVE_GETNAMEINFO definition before using GETNAMEINFO_XXX definitions.
2006-07-04 10:27:11 +08:00
Move curl_dofreeaddrinfo() and curl_dofreeaddrinfo() implementation from lib/hostip6.c to lib/curl_addrinfo.c and prototypes from lib/hostip.h to lib/curl_addrinfo.h
2008-10-31 03:02:23 +08:00
#ifdef HAVE_FREEADDRINFO
Yang Tse fixed compiler warnings
2005-11-14 07:53:14 +08:00
#undef freeaddrinfo
getaddrinfo() cleanups
2001-10-04 21:25:12 +08:00
#define freeaddrinfo(data) \
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
curl_dbg_freeaddrinfo(data, __LINE__, __FILE__)
Move curl_dofreeaddrinfo() and curl_dofreeaddrinfo() implementation from lib/hostip6.c to lib/curl_addrinfo.c and prototypes from lib/hostip.h to lib/curl_addrinfo.h
2008-10-31 03:02:23 +08:00
#endif /* HAVE_FREEADDRINFO */
lib: memdebug comment fixup [ci skip] Follow-up to 3efba94f773db5d8ae19e33aa749ab7914cafeea #14765
2024-09-21 07:27:22 +08:00
#endif /* !CURL_NO_GETADDRINFO_OVERRIDE */
getaddrinfo() cleanups
2001-10-04 21:25:12 +08:00
added socket() / sclose() checks to the memdebug system
2000-12-14 23:56:59 +08:00
/* sclose is probably already defined, redefine it! */
#undef sclose
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
#define sclose(sockfd) curl_dbg_sclose(sockfd,__LINE__,__FILE__)
added socket() / sclose() checks to the memdebug system
2000-12-14 23:56:59 +08:00
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
#define fake_sclose(sockfd) curl_dbg_mark_sclose(sockfd,__LINE__,__FILE__)
Since the NSS lib closes the socket the memory tracking system wrongly gets a false positive on a leaked socket, so this introduces a way to tell the system that the socket is indeed closed without explicitly closing it!
2009-10-29 04:30:23 +08:00
Added fopen() and fclose() leak tracking
2000-12-19 21:23:54 +08:00
#undef fopen
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
#define fopen(file,mode) curl_dbg_fopen(file,mode,__LINE__,__FILE__)
Using fdopen() is a more correct way to implement the CURLOPT_NEW_FILE_PREMS file.c, but the debug interface was missing. This adds the routines needed to make the memory debuging work for fdopen().
2007-06-28 19:11:29 +08:00
#undef fdopen
memdebug: make debug-specific functions use curl_dbg_ prefix To not "collide" or use up the regular curl_ name space. Also makes them easier to detect in helper scripts. Closes #3656
2019-03-08 17:47:29 +08:00
#define fdopen(file,mode) curl_dbg_fdopen(file,mode,__LINE__,__FILE__)
#define fclose(file) curl_dbg_fclose(file,__LINE__,__FILE__)
Added fopen() and fclose() leak tracking
2000-12-19 21:23:54 +08:00
Dan Fandrich's cleanup patch to make pedantic compiler options cause less warnings. Minor edits by me.
2004-01-29 21:56:45 +08:00
#endif /* MEMDEBUG_NODEFINES */
Modified curl_accept() to take a 'void *' in the 2nd argument instead of sockaddr *. This has the added benefit that source files that include memdebug.h doesn't have to know about "sockaddr".
2004-02-18 20:18:33 +08:00
#endif /* CURLDEBUG */
Since the NSS lib closes the socket the memory tracking system wrongly gets a false positive on a leaked socket, so this introduces a way to tell the system that the socket is indeed closed without explicitly closing it!
2009-10-29 04:30:23 +08:00
MemoryTracking: fix logging of free() calls done where Curl_safefree is called Just internal stuff... Curl_safefree is now a macro defined in memdebug.h instead of a function prototyped in url.h and implemented in url.c, so inclusion of url.h is no longer required in order to simply use Curl_safefree. Provide definition of macro WHILE_FALSE in setup_once.h in order to allow other macros such as DEBUGF and DEBUGASSERT, and code using it, to compile without 'conditional expression is constant' warnings. The WHILE_FALSE stuff fixes 150+ MSVC compiler warnings.
2011-09-03 01:40:53 +08:00
/*
** Following section applies even when CURLDEBUG is not defined.
*/
Since the NSS lib closes the socket the memory tracking system wrongly gets a false positive on a leaked socket, so this introduces a way to tell the system that the socket is indeed closed without explicitly closing it!
2009-10-29 04:30:23 +08:00
#ifndef fake_sclose
fix a bunch of MSVC compiler warnings
2011-09-03 22:06:10 +08:00
#define fake_sclose(x) Curl_nop_stmt
Since the NSS lib closes the socket the memory tracking system wrongly gets a false positive on a leaked socket, so this introduces a way to tell the system that the socket is indeed closed without explicitly closing it!
2009-10-29 04:30:23 +08:00
#endif
MemoryTracking: fix logging of free() calls done where Curl_safefree is called Just internal stuff... Curl_safefree is now a macro defined in memdebug.h instead of a function prototyped in url.h and implemented in url.c, so inclusion of url.h is no longer required in order to simply use Curl_safefree. Provide definition of macro WHILE_FALSE in setup_once.h in order to allow other macros such as DEBUGF and DEBUGASSERT, and code using it, to compile without 'conditional expression is constant' warnings. The WHILE_FALSE stuff fixes 150+ MSVC compiler warnings.
2011-09-03 01:40:53 +08:00
/*
* Curl_safefree defined as a macro to allow MemoryTracking feature
* to log free() calls at same location where Curl_safefree is used.
Make Curl_safefree() macro assign NULL to given pointer when free'd
2011-09-15 23:35:23 +08:00
* This macro also assigns NULL to given pointer when free'd.
MemoryTracking: fix logging of free() calls done where Curl_safefree is called Just internal stuff... Curl_safefree is now a macro defined in memdebug.h instead of a function prototyped in url.h and implemented in url.c, so inclusion of url.h is no longer required in order to simply use Curl_safefree. Provide definition of macro WHILE_FALSE in setup_once.h in order to allow other macros such as DEBUGF and DEBUGASSERT, and code using it, to compile without 'conditional expression is constant' warnings. The WHILE_FALSE stuff fixes 150+ MSVC compiler warnings.
2011-09-03 01:40:53 +08:00
*/
Make Curl_safefree() macro assign NULL to given pointer when free'd
2011-09-15 23:35:23 +08:00
#define Curl_safefree(ptr) \
build: Disable Visual Studio warning "conditional expression is constant" - Disable warning C4127 "conditional expression is constant" globally in curl_setup.h for when building with Microsoft's compiler. This mainly affects building with the Visual Studio project files found in the projects dir. Prior to this change the cmake and winbuild build systems already disabled 4127 globally for when building with Microsoft's compiler. Also, 4127 was already disabled for all build systems in the limited circumstance of the WHILE_FALSE macro which disabled the warning specifically for while(0). This commit removes the WHILE_FALSE macro and all other cruft in favor of disabling globally in curl_setup. Background: We have various macros that cause 0 or 1 to be evaluated, which would cause warning C4127 in Visual Studio. For example this causes it: #define Curl_resolver_asynch() 1 Full behavior is not clearly defined and inconsistent across versions. However it is documented that since VS 2015 Update 3 Microsoft has addressed this somewhat but not entirely, not warning on while(true) for example. Prior to this change some C4127 warnings occurred when I built with Visual Studio using the generated projects in the projects dir. Closes https://github.com/curl/curl/pull/4658
2019-11-30 16:29:36 +08:00
do { free((ptr)); (ptr) = NULL;} while(0)
MemoryTracking: fix logging of free() calls done where Curl_safefree is called Just internal stuff... Curl_safefree is now a macro defined in memdebug.h instead of a function prototyped in url.h and implemented in url.c, so inclusion of url.h is no longer required in order to simply use Curl_safefree. Provide definition of macro WHILE_FALSE in setup_once.h in order to allow other macros such as DEBUGF and DEBUGASSERT, and code using it, to compile without 'conditional expression is constant' warnings. The WHILE_FALSE stuff fixes 150+ MSVC compiler warnings.
2011-09-03 01:40:53 +08:00
#endif /* HEADER_CURL_MEMDEBUG_H */
Reference in New Issue Copy Permalink