mirror of
https://github.com/moparisthebest/curl
synced 2024-11-10 11:35:07 -05:00
ee588fe088
If we use memory functions (malloc, free, strdup etc) in C sources in libcurl and we fail to include curl_memory.h or memdebug.h we either fail to properly support user-provided memory callbacks or the memory leak system of the test suite fails. After Ajit's report of a failure in the first category in http_proxy.c, I spotted a few in the second category as well. These problems are now tested for by test 1132 which runs a perl program that scans for and attempts to check that we use the correct include files if a memory related function is used in the source code. Reported by: Ajit Dhumale Bug: http://curl.haxx.se/mail/lib-2012-11/0125.html
86 lines
2.5 KiB
C
86 lines
2.5 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2012, 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 http://curl.haxx.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.
|
|
*
|
|
***************************************************************************/
|
|
|
|
/*
|
|
* IDN conversions using Windows kernel32 and normaliz libraries.
|
|
*/
|
|
|
|
#include "setup.h"
|
|
|
|
#ifdef USE_WIN32_IDN
|
|
|
|
#include "curl_multibyte.h"
|
|
|
|
#include "curl_memory.h"
|
|
/* The last #include file should be: */
|
|
#include "memdebug.h"
|
|
|
|
#ifdef WANT_IDN_PROTOTYPES
|
|
WINBASEAPI int WINAPI IdnToAscii(DWORD, const WCHAR *, int, WCHAR *, int);
|
|
WINBASEAPI int WINAPI IdnToUnicode(DWORD, const WCHAR *, int, WCHAR *, int);
|
|
#endif
|
|
|
|
#define IDN_MAX_LENGTH 255
|
|
|
|
int curl_win32_idn_to_ascii(const char *in, char **out);
|
|
int curl_win32_ascii_to_idn(const char *in, size_t in_len, char **out_utf8);
|
|
|
|
int curl_win32_idn_to_ascii(const char *in, char **out)
|
|
{
|
|
wchar_t *in_w = Curl_convert_UTF8_to_wchar(in);
|
|
if(in_w) {
|
|
wchar_t punycode[IDN_MAX_LENGTH];
|
|
if(IdnToAscii(0, in_w, -1, punycode, IDN_MAX_LENGTH) == 0) {
|
|
wprintf(L"ERROR %d converting to Punycode\n", GetLastError());
|
|
free(in_w);
|
|
return 0;
|
|
}
|
|
free(in_w);
|
|
|
|
*out = Curl_convert_wchar_to_UTF8(punycode);
|
|
if(!*out)
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
int curl_win32_ascii_to_idn(const char *in, size_t in_len, char **out_utf8)
|
|
{
|
|
(void)in_len; /* unused */
|
|
if(in) {
|
|
WCHAR unicode[IDN_MAX_LENGTH];
|
|
|
|
if(IdnToUnicode(0, (wchar_t *)in, -1, unicode, IDN_MAX_LENGTH) == 0) {
|
|
wprintf(L"ERROR %d converting to Punycode\n", GetLastError());
|
|
return 0;
|
|
}
|
|
else {
|
|
*out_utf8 = Curl_convert_wchar_to_UTF8(unicode);
|
|
if(!*out_utf8)
|
|
return 0;
|
|
}
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
#endif /* USE_WIN32_IDN */
|