JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* strfuncs.cc (sys_cp_mbstowcs): Don't read beyond src + nms.

Browse Source
This commit is contained in:
Corinna Vinschen 2009-03-24 16:42:36 +00:00
parent dd15241df7
commit ba8f298cbc
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,7 @@
2009-03-24 Corinna Vinschen <corinna@vinschen.de>
* strfuncs.cc (sys_cp_mbstowcs): Don't read beyond src + nms.
2009-03-24 Corinna Vinschen <corinna@vinschen.de> 2009-03-24 Corinna Vinschen <corinna@vinschen.de>
* shared_info.h (CURR_SHARED_MAGIC): Update. * shared_info.h (CURR_SHARED_MAGIC): Update.

3
winsup/cygwin/strfuncs.cc
View File

@ -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); memset (&ps, 0, sizeof ps);
if (dst == NULL) if (dst == NULL)
len = (size_t)-1; len = (size_t)-1;
while (len > 0) while (len > 0 && nms > 0)
{ {
/* ASCII SO. Convert following UTF-8 sequence (if not UTF-8 anyway). */ /* ASCII SO. Convert following UTF-8 sequence (if not UTF-8 anyway). */
if (*pmbs == 0x0e && *charset != 'U'/*TF-8*/) if (*pmbs == 0x0e && *charset != 'U'/*TF-8*/)
{ {
pmbs++; pmbs++;
--nms;
bytes = __utf8_mbtowc (_REENT, ptr, pmbs, nms, charset, &ps); bytes = __utf8_mbtowc (_REENT, ptr, pmbs, nms, charset, &ps);
if (bytes < 0) if (bytes < 0)
{ {