projects
/
platform
/
upstream
/
curl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 7.44.0
[platform/upstream/curl.git]
/
lib
/
curl_multibyte.c
diff --git
a/lib/curl_multibyte.c
b/lib/curl_multibyte.c
index
6e65722
..
403d005
100644
(file)
--- a/
lib/curl_multibyte.c
+++ b/
lib/curl_multibyte.c
@@
-23,18
+23,15
@@
#include "curl_setup.h"
#if defined(USE_WIN32_IDN) || ((defined(USE_WINDOWS_SSPI) || \
#include "curl_setup.h"
#if defined(USE_WIN32_IDN) || ((defined(USE_WINDOWS_SSPI) || \
- defined(
CURL_LDAP_WIN
)) && defined(UNICODE))
+ defined(
USE_WIN32_LDAP
)) && defined(UNICODE))
/*
* MultiByte conversions using Windows kernel32 library.
*/
#include "curl_multibyte.h"
/*
* MultiByte conversions using Windows kernel32 library.
*/
#include "curl_multibyte.h"
-
-#define _MPRINTF_REPLACE /* use our functions only */
-#include <curl/mprintf.h>
-
#include "curl_memory.h"
#include "curl_memory.h"
+
/* The last #include file should be: */
#include "memdebug.h"
/* The last #include file should be: */
#include "memdebug.h"
@@
-50,7
+47,8
@@
wchar_t *Curl_convert_UTF8_to_wchar(const char *str_utf8)
if(str_w) {
if(MultiByteToWideChar(CP_UTF8, 0, str_utf8, -1, str_w,
str_w_len) == 0) {
if(str_w) {
if(MultiByteToWideChar(CP_UTF8, 0, str_utf8, -1, str_w,
str_w_len) == 0) {
- Curl_safefree(str_w);
+ free(str_w);
+ return NULL;
}
}
}
}
}
}
@@
-71,7
+69,8
@@
char *Curl_convert_wchar_to_UTF8(const wchar_t *str_w)
if(str_utf8) {
if(WideCharToMultiByte(CP_UTF8, 0, str_w, -1, str_utf8, str_utf8_len,
NULL, FALSE) == 0) {
if(str_utf8) {
if(WideCharToMultiByte(CP_UTF8, 0, str_w, -1, str_utf8, str_utf8_len,
NULL, FALSE) == 0) {
- Curl_safefree(str_utf8);
+ free(str_utf8);
+ return NULL;
}
}
}
}
}
}
@@
-80,4
+79,4
@@
char *Curl_convert_wchar_to_UTF8(const wchar_t *str_w)
return str_utf8;
}
return str_utf8;
}
-#endif /* USE_WIN32_IDN || ((USE_WINDOWS_SSPI ||
CURL_LDAP_WIN
) && UNICODE) */
+#endif /* USE_WIN32_IDN || ((USE_WINDOWS_SSPI ||
USE_WIN32_LDAP
) && UNICODE) */