tests/server: sync memory callbacks with `lib/easy.c`

Cherry-picked from #15000
Closes #16699

diff --git a/tests/server/getpart.c b/tests/server/getpart.c
index 67ac0865a4137ebd71c7375dc84a495dbe446dc1..7f3108f47bd9c010c32d1a8d73c19895bd682d4e 100644 (file)
--- a/tests/server/getpart.c
+++ b/tests/server/getpart.c
@@ -50,6 +50,14 @@
 #define show(x) Curl_nop_stmt
 #endif
 
+#if defined(UNDER_CE)
+#define system_strdup _strdup
+#elif !defined(HAVE_STRDUP)
+#define system_strdup Curl_strdup
+#else
+#define system_strdup strdup
+#endif
+
 #if defined(_MSC_VER) && defined(_DLL)
 #  pragma warning(push)
 #  pragma warning(disable:4232) /* MSVC extension, dllimport identity */
@@ -58,10 +66,10 @@
 curl_malloc_callback Curl_cmalloc = (curl_malloc_callback)malloc;
 curl_free_callback Curl_cfree = (curl_free_callback)free;
 curl_realloc_callback Curl_crealloc = (curl_realloc_callback)realloc;
-curl_strdup_callback Curl_cstrdup = (curl_strdup_callback)strdup;
+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_callback)_wcsdup;
+curl_wcsdup_callback Curl_cwcsdup = Curl_wcsdup;
 #endif
 
 #if defined(_MSC_VER) && defined(_DLL)

diff --git a/tests/server/getpart.h b/tests/server/getpart.h
index e9323d4c9a48350a8059a8ed1027d22fc1c145bb..cd2417a8953ddbb43e1e8bf967c537c0e8137f07 100644 (file)
--- a/tests/server/getpart.h
+++ b/tests/server/getpart.h
@@ -25,6 +25,8 @@
  ***************************************************************************/
 #include "server_setup.h"
 
+#include "strdup.h"
+
 #define GPE_NO_BUFFER_SPACE -2
 #define GPE_OUT_OF_MEMORY   -1
 #define GPE_OK               0