mirror of
https://github.com/curl/curl.git
synced 2026-04-22 00:32:12 +03:00
Before this patch curl used the C preprocessor to override standard memory allocation symbols: malloc, calloc, strdup, realloc, free. The goal of these is to replace them with curl's debug wrappers in `CURLDEBUG` builds, another was to replace them with the wrappers calling user-defined allocators in libcurl. This solution needed a bunch of workarounds to avoid breaking external headers: it relied on include order to do the overriding last. For "unity" builds it needed to reset overrides before external includes. Also in test apps, which are always built as single source files. It also needed the `(symbol)` trick to avoid overrides in some places. This would still not fix cases where the standard symbols were macros. It was also fragile and difficult to figure out which was the actual function behind an alloc or free call in a specific piece of code. This in turn caused bugs where the wrong allocator was accidentally called. To avoid these problems, this patch replaces this solution with `curlx_`-prefixed allocator macros, and mapping them _once_ to either the libcurl wrappers, the debug wrappers or the standard ones, matching the rest of the code in libtests. This concludes the long journey to avoid redefining standard functions in the curl codebase. Note: I did not update `packages/OS400/*.c` sources. They did not `#include` `curl_setup.h`, `curl_memory.h` or `memdebug.h`, meaning the overrides were never applied to them. This may or may not have been correct. For now I suppressed the direct use of standard allocators via a local `.checksrc`. Probably they (except for `curlcl.c`) should be updated to include `curl_setup.h` and use the `curlx_` macros. This patch changes mappings in two places: - `lib/curl_threads.c` in libtests: Before this patch it mapped to libcurl allocators. After, it maps to standard allocators, like the rest of libtests code. - `units`: before this patch it mapped to standard allocators. After, it maps to libcurl allocators. Also: - drop all position-dependent `curl_memory.h` and `memdebug.h` includes, and delete the now unnecessary headers. - rename `Curl_tcsdup` macro to `curlx_tcsdup` and define like the other allocators. - map `curlx_strdup()` to `_strdup()` on Windows (was: `strdup()`). To fix warnings silenced via `_CRT_NONSTDC_NO_DEPRECATE`. - multibyte: map `curlx_convert_*()` to `_strdup()` on Windows (was: `strdup()`). - src: do not reuse the `strdup` name for the local replacement. - lib509: call `_strdup()` on Windows (was: `strdup()`). - test1132: delete test obsoleted by this patch. - CHECKSRC.md: update text for `SNPRINTF`. - checksrc: ban standard allocator symbols. Follow-up tob12da22db1#18866 Follow-up todb98daab05#18844 Follow-up to4deea9396b#18814 Follow-up to9678ff5b1b#18776 Follow-up to10bac43b87#18774 Follow-up to20142f5d06#18634 Follow-up tobf7375ecc5#18503 Follow-up to9863599d69#18502 Follow-up to3bb5e58c10#17827 Closes #19626
242 lines
7.5 KiB
C
242 lines
7.5 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Steve Holme, <steve_holme@hotmail.com>.
|
|
*
|
|
* 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_setup.h"
|
|
|
|
#ifdef _WIN32
|
|
|
|
#include <curl/curl.h>
|
|
#include "system_win32.h"
|
|
#include "curlx/version_win32.h"
|
|
#include "curl_sspi.h"
|
|
#include "curlx/warnless.h"
|
|
|
|
#ifndef HAVE_IF_NAMETOINDEX
|
|
/* Handle of iphlpapp.dll */
|
|
static HMODULE s_hIpHlpApiDll = NULL;
|
|
|
|
/* Pointer to the if_nametoindex function */
|
|
IF_NAMETOINDEX_FN Curl_if_nametoindex = NULL;
|
|
|
|
/* This is used to dynamically load DLLs */
|
|
static HMODULE curl_load_library(LPCTSTR filename);
|
|
#endif
|
|
|
|
/* Curl_win32_init() performs Win32 global initialization */
|
|
CURLcode Curl_win32_init(long flags)
|
|
{
|
|
/* CURL_GLOBAL_WIN32 controls the *optional* part of the initialization which
|
|
is just for Winsock at the moment. Any required Win32 initialization
|
|
should take place after this block. */
|
|
if(flags & CURL_GLOBAL_WIN32) {
|
|
#ifdef USE_WINSOCK
|
|
WORD wVersionRequested;
|
|
WSADATA wsaData;
|
|
int res;
|
|
|
|
wVersionRequested = MAKEWORD(2, 2);
|
|
res = WSAStartup(wVersionRequested, &wsaData);
|
|
|
|
if(res)
|
|
/* Tell the user that we could not find a usable */
|
|
/* winsock.dll. */
|
|
return CURLE_FAILED_INIT;
|
|
|
|
/* Confirm that the Windows Sockets DLL supports what we need.*/
|
|
/* Note that if the DLL supports versions greater */
|
|
/* than wVersionRequested, it will still return */
|
|
/* wVersionRequested in wVersion. wHighVersion contains the */
|
|
/* highest supported version. */
|
|
|
|
if(LOBYTE(wsaData.wVersion) != LOBYTE(wVersionRequested) ||
|
|
HIBYTE(wsaData.wVersion) != HIBYTE(wVersionRequested) ) {
|
|
/* Tell the user that we could not find a usable */
|
|
|
|
/* winsock.dll. */
|
|
WSACleanup();
|
|
return CURLE_FAILED_INIT;
|
|
}
|
|
/* The Windows Sockets DLL is acceptable. Proceed. */
|
|
#elif defined(USE_LWIPSOCK)
|
|
lwip_init();
|
|
#endif
|
|
} /* CURL_GLOBAL_WIN32 */
|
|
|
|
#ifdef USE_WINDOWS_SSPI
|
|
{
|
|
CURLcode result = Curl_sspi_global_init();
|
|
if(result)
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
#ifndef HAVE_IF_NAMETOINDEX
|
|
s_hIpHlpApiDll = curl_load_library(TEXT("iphlpapi.dll"));
|
|
if(s_hIpHlpApiDll) {
|
|
/* Get the address of the if_nametoindex function */
|
|
IF_NAMETOINDEX_FN pIfNameToIndex =
|
|
CURLX_FUNCTION_CAST(IF_NAMETOINDEX_FN,
|
|
GetProcAddress(s_hIpHlpApiDll, "if_nametoindex"));
|
|
|
|
if(pIfNameToIndex)
|
|
Curl_if_nametoindex = pIfNameToIndex;
|
|
}
|
|
#endif
|
|
|
|
/* curlx_verify_windows_version must be called during init at least once
|
|
because it has its own initialization routine. */
|
|
if(curlx_verify_windows_version(6, 0, 0, PLATFORM_WINNT,
|
|
VERSION_GREATER_THAN_EQUAL)) {
|
|
Curl_isVistaOrGreater = TRUE;
|
|
}
|
|
else
|
|
Curl_isVistaOrGreater = FALSE;
|
|
|
|
QueryPerformanceFrequency(&Curl_freq);
|
|
return CURLE_OK;
|
|
}
|
|
|
|
/* Curl_win32_cleanup() is the opposite of Curl_win32_init() */
|
|
void Curl_win32_cleanup(long init_flags)
|
|
{
|
|
#ifndef HAVE_IF_NAMETOINDEX
|
|
if(s_hIpHlpApiDll) {
|
|
FreeLibrary(s_hIpHlpApiDll);
|
|
s_hIpHlpApiDll = NULL;
|
|
Curl_if_nametoindex = NULL;
|
|
}
|
|
#endif
|
|
|
|
#ifdef USE_WINDOWS_SSPI
|
|
Curl_sspi_global_cleanup();
|
|
#endif
|
|
|
|
if(init_flags & CURL_GLOBAL_WIN32) {
|
|
#ifdef USE_WINSOCK
|
|
WSACleanup();
|
|
#endif
|
|
}
|
|
}
|
|
|
|
#ifndef HAVE_IF_NAMETOINDEX
|
|
|
|
#ifndef LOAD_WITH_ALTERED_SEARCH_PATH
|
|
#define LOAD_WITH_ALTERED_SEARCH_PATH 0x00000008
|
|
#endif
|
|
|
|
#ifndef LOAD_LIBRARY_SEARCH_SYSTEM32
|
|
#define LOAD_LIBRARY_SEARCH_SYSTEM32 0x00000800
|
|
#endif
|
|
|
|
/* We use our own typedef here since some headers might lack these */
|
|
typedef HMODULE (APIENTRY *LOADLIBRARYEX_FN)(LPCTSTR, HANDLE, DWORD);
|
|
|
|
/* See function definitions in winbase.h */
|
|
#ifdef UNICODE
|
|
# define LOADLIBARYEX "LoadLibraryExW"
|
|
#else
|
|
# define LOADLIBARYEX "LoadLibraryExA"
|
|
#endif
|
|
|
|
/*
|
|
* curl_load_library()
|
|
*
|
|
* This is used to dynamically load DLLs using the most secure method available
|
|
* for the version of Windows that we are running on.
|
|
*
|
|
* Parameters:
|
|
*
|
|
* filename [in] - The filename or full path of the DLL to load. If only the
|
|
* filename is passed then the DLL will be loaded from the
|
|
* Windows system directory.
|
|
*
|
|
* Returns the handle of the module on success; otherwise NULL.
|
|
*/
|
|
static HMODULE curl_load_library(LPCTSTR filename)
|
|
{
|
|
#ifndef CURL_WINDOWS_UWP
|
|
HMODULE hModule = NULL;
|
|
LOADLIBRARYEX_FN pLoadLibraryEx = NULL;
|
|
|
|
/* Get a handle to kernel32 so we can access its functions at runtime */
|
|
HMODULE hKernel32 = GetModuleHandle(TEXT("kernel32"));
|
|
if(!hKernel32)
|
|
return NULL;
|
|
|
|
/* Attempt to find LoadLibraryEx() which is only available on Windows 2000
|
|
and above */
|
|
pLoadLibraryEx =
|
|
CURLX_FUNCTION_CAST(LOADLIBRARYEX_FN,
|
|
GetProcAddress(hKernel32, LOADLIBARYEX));
|
|
|
|
/* Detect if there is already a path in the filename and load the library if
|
|
there is. Note: Both back slashes and forward slashes have been supported
|
|
since the earlier days of DOS at an API level although they are not
|
|
supported by command prompt */
|
|
if(_tcspbrk(filename, TEXT("\\/"))) {
|
|
/** !checksrc! disable BANNEDFUNC 1 **/
|
|
hModule = pLoadLibraryEx ?
|
|
pLoadLibraryEx(filename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH) :
|
|
LoadLibrary(filename);
|
|
}
|
|
/* Detect if KB2533623 is installed, as LOAD_LIBRARY_SEARCH_SYSTEM32 is only
|
|
supported on Windows Vista, Windows Server 2008, Windows 7 and Windows
|
|
Server 2008 R2 with this patch or natively on Windows 8 and above */
|
|
else if(pLoadLibraryEx && GetProcAddress(hKernel32, "AddDllDirectory")) {
|
|
/* Load the DLL from the Windows system directory */
|
|
hModule = pLoadLibraryEx(filename, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
|
|
}
|
|
else {
|
|
/* Attempt to get the Windows system path */
|
|
UINT systemdirlen = GetSystemDirectory(NULL, 0);
|
|
if(systemdirlen) {
|
|
/* Allocate space for the full DLL path (Room for the null-terminator
|
|
is included in systemdirlen) */
|
|
size_t filenamelen = _tcslen(filename);
|
|
TCHAR *path = curlx_malloc(sizeof(TCHAR) *
|
|
(systemdirlen + 1 + filenamelen));
|
|
if(path && GetSystemDirectory(path, systemdirlen)) {
|
|
/* Calculate the full DLL path */
|
|
_tcscpy(path + _tcslen(path), TEXT("\\"));
|
|
_tcscpy(path + _tcslen(path), filename);
|
|
|
|
/* Load the DLL from the Windows system directory */
|
|
/** !checksrc! disable BANNEDFUNC 1 **/
|
|
hModule = pLoadLibraryEx ?
|
|
pLoadLibraryEx(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH) :
|
|
LoadLibrary(path);
|
|
}
|
|
curlx_free(path);
|
|
}
|
|
}
|
|
return hModule;
|
|
#else
|
|
/* the Universal Windows Platform (UWP) cannot do this */
|
|
(void)filename;
|
|
return NULL;
|
|
#endif
|
|
}
|
|
#endif /* !HAVE_IF_NAMETOINDEX */
|
|
|
|
#endif /* _WIN32 */
|