romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-30 17:38:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

windows: fix wcsdup callback initialization in curl_global_init()

Browse source 
Also:
- add two related casts to match rest of code.
- replace deprecated `wcsdup` with `_wcsdup` in libtests.
  Ref: https://learn.microsoft.com/cpp/c-runtime-library/reference/strdup-wcsdup

Follow-up to 76e047fc27 #7540
Bug: https://github.com/curl/curl/pull/17840#issuecomment-3044361245
Bug: https://github.com/curl/curl/pull/7540#issuecomment-2380995349

Closes #17840
This commit is contained in:
Viktor Szakats 2025-07-07 11:46:26 +02:00
parent 4188db5db9
commit ba0b245a3f
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/easy.c
View file

@ -130,7 +130,7 @@ curl_realloc_callback Curl_crealloc = (curl_realloc_callback)realloc;
curl_strdup_callback Curl_cstrdup = (curl_strdup_callback)system_strdup;
curl_calloc_callback Curl_ccalloc = (curl_calloc_callback)calloc;
#if defined(_WIN32) && defined(UNICODE)
curl_wcsdup_callback Curl_cwcsdup = Curl_wcsdup;
curl_wcsdup_callback Curl_cwcsdup = (curl_wcsdup_callback)Curl_wcsdup;
#endif
#if defined(_MSC_VER) && defined(_DLL)
@ -158,7 +158,7 @@ static CURLcode global_init(long flags, bool memoryfuncs)
Curl_cstrdup = (curl_strdup_callback)system_strdup;
Curl_ccalloc = (curl_calloc_callback)calloc;
#if defined(_WIN32) && defined(UNICODE)
Curl_cwcsdup = (curl_wcsdup_callback)_wcsdup;
Curl_cwcsdup = (curl_wcsdup_callback)Curl_wcsdup;
#endif
}

2
tests/libtest/memptr.c
View file

@ -41,7 +41,7 @@ curl_realloc_callback Curl_crealloc = (curl_realloc_callback)realloc;
curl_strdup_callback Curl_cstrdup = (curl_strdup_callback)strdup;
curl_calloc_callback Curl_ccalloc = (curl_calloc_callback)calloc;
#if defined(_WIN32) && defined(UNICODE)
curl_wcsdup_callback Curl_cwcsdup = wcsdup;
curl_wcsdup_callback Curl_cwcsdup = (curl_wcsdup_callback)_wcsdup;
#endif
#if defined(_MSC_VER) && defined(_DLL)