summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/strfuncs.cc
diff options
context:
space:
mode:
Diffstat (limited to 'winsup/cygwin/strfuncs.cc')
-rw-r--r--winsup/cygwin/strfuncs.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/winsup/cygwin/strfuncs.cc b/winsup/cygwin/strfuncs.cc
index 5a9dd7d14..9386d7885 100644
--- a/winsup/cygwin/strfuncs.cc
+++ b/winsup/cygwin/strfuncs.cc
@@ -423,12 +423,13 @@ sys_cp_mbstowcs (UINT cp, PWCHAR dst, size_t dlen, const char *src, size_t nms)
memset (&ps, 0, sizeof ps);
if (dst == NULL)
len = (size_t)-1;
- while (len > 0)
+ while (len > 0 && nms > 0)
{
/* ASCII SO. Convert following UTF-8 sequence (if not UTF-8 anyway). */
if (*pmbs == 0x0e && *charset != 'U'/*TF-8*/)
{
pmbs++;
+ --nms;
bytes = __utf8_mbtowc (_REENT, ptr, pmbs, nms, charset, &ps);
if (bytes < 0)
{