mirror of
https://github.com/moparisthebest/curl
synced 2024-12-25 09:38:54 -05:00
765e060796
- If the UTF-8 to UTF-16 conversion fails in Windows Unicode builds then no longer fall back to assuming the string is in a local encoding. Background: Some functions in Windows Unicode builds must convert UTF-8 to UTF-16 to pass to the Windows CRT API wide-character functions since in Windows UTF-8 is not a valid locale (or at least 99% of the time right now). Prior to this change if the Unicode encoding conversion failed then libcurl would assume, for backwards compatibility with applications that may have written their code for non-Unicode builds, attempt to convert the string from local encoding to UTF-16. That type of "best effort" could theoretically cause some type of security or other problem if a string that was locally encoded was also valid UTF-8, and therefore an unexpected UTF-8 to UTF-16 conversion could occur. Ref: https://github.com/curl/curl/pull/7246 Closes https://github.com/curl/curl/pull/7257
178 lines
4.3 KiB
C
178 lines
4.3 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* 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.
|
|
*
|
|
***************************************************************************/
|
|
|
|
/*
|
|
* This file is 'mem-include-scan' clean, which means memdebug.h and
|
|
* curl_memory.h are purposely not included in this file. See test 1132.
|
|
*
|
|
* The functions in this file are curlx functions which are not tracked by the
|
|
* curl memory tracker memdebug.
|
|
*/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#if defined(WIN32)
|
|
|
|
#include "curl_multibyte.h"
|
|
|
|
/*
|
|
* MultiByte conversions using Windows kernel32 library.
|
|
*/
|
|
|
|
wchar_t *curlx_convert_UTF8_to_wchar(const char *str_utf8)
|
|
{
|
|
wchar_t *str_w = NULL;
|
|
|
|
if(str_utf8) {
|
|
int str_w_len = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS,
|
|
str_utf8, -1, NULL, 0);
|
|
if(str_w_len > 0) {
|
|
str_w = malloc(str_w_len * sizeof(wchar_t));
|
|
if(str_w) {
|
|
if(MultiByteToWideChar(CP_UTF8, 0, str_utf8, -1, str_w,
|
|
str_w_len) == 0) {
|
|
free(str_w);
|
|
return NULL;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return str_w;
|
|
}
|
|
|
|
char *curlx_convert_wchar_to_UTF8(const wchar_t *str_w)
|
|
{
|
|
char *str_utf8 = NULL;
|
|
|
|
if(str_w) {
|
|
int bytes = WideCharToMultiByte(CP_UTF8, 0, str_w, -1,
|
|
NULL, 0, NULL, NULL);
|
|
if(bytes > 0) {
|
|
str_utf8 = malloc(bytes);
|
|
if(str_utf8) {
|
|
if(WideCharToMultiByte(CP_UTF8, 0, str_w, -1, str_utf8, bytes,
|
|
NULL, NULL) == 0) {
|
|
free(str_utf8);
|
|
return NULL;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return str_utf8;
|
|
}
|
|
|
|
#endif /* WIN32 */
|
|
|
|
#if defined(USE_WIN32_LARGE_FILES) || defined(USE_WIN32_SMALL_FILES)
|
|
|
|
int curlx_win32_open(const char *filename, int oflag, ...)
|
|
{
|
|
int pmode = 0;
|
|
|
|
#ifdef _UNICODE
|
|
int result = -1;
|
|
wchar_t *filename_w = curlx_convert_UTF8_to_wchar(filename);
|
|
#endif
|
|
|
|
va_list param;
|
|
va_start(param, oflag);
|
|
if(oflag & O_CREAT)
|
|
pmode = va_arg(param, int);
|
|
va_end(param);
|
|
|
|
#ifdef _UNICODE
|
|
if(filename_w) {
|
|
result = _wopen(filename_w, oflag, pmode);
|
|
free(filename_w);
|
|
}
|
|
else
|
|
errno = EINVAL;
|
|
return result;
|
|
#else
|
|
return (_open)(filename, oflag, pmode);
|
|
#endif
|
|
}
|
|
|
|
FILE *curlx_win32_fopen(const char *filename, const char *mode)
|
|
{
|
|
#ifdef _UNICODE
|
|
FILE *result = NULL;
|
|
wchar_t *filename_w = curlx_convert_UTF8_to_wchar(filename);
|
|
wchar_t *mode_w = curlx_convert_UTF8_to_wchar(mode);
|
|
if(filename_w && mode_w)
|
|
result = _wfopen(filename_w, mode_w);
|
|
else
|
|
errno = EINVAL;
|
|
free(filename_w);
|
|
free(mode_w);
|
|
return result;
|
|
#else
|
|
return (fopen)(filename, mode);
|
|
#endif
|
|
}
|
|
|
|
int curlx_win32_stat(const char *path, struct_stat *buffer)
|
|
{
|
|
#ifdef _UNICODE
|
|
int result = -1;
|
|
wchar_t *path_w = curlx_convert_UTF8_to_wchar(path);
|
|
if(path_w) {
|
|
#if defined(USE_WIN32_SMALL_FILES)
|
|
result = _wstat(path_w, buffer);
|
|
#else
|
|
result = _wstati64(path_w, buffer);
|
|
#endif
|
|
free(path_w);
|
|
}
|
|
else
|
|
errno = EINVAL;
|
|
return result;
|
|
#else
|
|
#if defined(USE_WIN32_SMALL_FILES)
|
|
return _stat(path, buffer);
|
|
#else
|
|
return _stati64(path, buffer);
|
|
#endif
|
|
#endif
|
|
}
|
|
|
|
int curlx_win32_access(const char *path, int mode)
|
|
{
|
|
#if defined(_UNICODE)
|
|
int result = -1;
|
|
wchar_t *path_w = curlx_convert_UTF8_to_wchar(path);
|
|
if(path_w) {
|
|
result = _waccess(path_w, mode);
|
|
free(path_w);
|
|
}
|
|
else
|
|
errno = EINVAL;
|
|
return result;
|
|
#else
|
|
return _access(path, mode);
|
|
#endif
|
|
}
|
|
|
|
#endif /* USE_WIN32_LARGE_FILES || USE_WIN32_SMALL_FILES */
|