summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2016-03-10 21:52:09 +0000
committerSteve Holme <steve_holme@hotmail.com>2016-03-10 21:52:09 +0000
commit28477fd67a8ee0706820c33601e61ad558e597e3 (patch)
tree4ea9d8a22ff4877bc1742c29aaecafa91338d3b3 /lib
parenteab769518ec03ec21a8f14790322194dd5b6cd95 (diff)
downloadcurl-28477fd67a8ee0706820c33601e61ad558e597e3.tar.gz
idn_win32.c: Fixed compilation warning from commit 9e7fcd4291
warning C4267: 'function': conversion from 'size_t' to 'int', possible loss of data
Diffstat (limited to 'lib')
-rw-r--r--lib/idn_win32.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/idn_win32.c b/lib/idn_win32.c
index 96b4e2267..ae4a6832e 100644
--- a/lib/idn_win32.c
+++ b/lib/idn_win32.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, 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
@@ -29,9 +29,10 @@
#ifdef USE_WIN32_IDN
#include "curl_multibyte.h"
-
#include "curl_memory.h"
-/* The last #include file should be: */
+#include "warnless.h"
+
+ /* The last #include file should be: */
#include "memdebug.h"
#ifdef WANT_IDN_PROTOTYPES
@@ -89,8 +90,10 @@ int curl_win32_ascii_to_idn(const char *in, char **out)
int ret = 0;
wchar_t *in_w = Curl_convert_UTF8_to_wchar(in);
if(in_w) {
+ size_t in_len = wcslen(in_w) + 1;
wchar_t unicode[IDN_MAX_LENGTH];
- int chars = IdnToUnicode(0, in_w, wcslen(in_w)+1, unicode, IDN_MAX_LENGTH);
+ int chars = IdnToUnicode(0, in_w, curlx_uztosi(in_len),
+ unicode, IDN_MAX_LENGTH);
free(in_w);
if(chars) {
*out = Curl_convert_wchar_to_UTF8(unicode);