Skip to content

Fix heap buffer underflow in PDC_mbstowcs() and PDC_wcstombs() #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
serhiy-storchaka wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix heap buffer underflow in PDC_mbstowcs() and PDC_wcstombs() #384

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions pdcurses/util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,8 @@ size_t PDC_mbstowcs(wchar_t *dest, const char *src, size_t n)
}
# else
size_t i = mbstowcs(dest, src, n);
if (i == (size_t)-1) /* an invalid multibyte sequence */
return i;
# endif
dest[i] = 0;
return i;
Expand All @@ -473,28 +475,32 @@ size_t PDC_mbstowcs(wchar_t *dest, const char *src, size_t n)
size_t PDC_wcstombs(char *dest, const wchar_t *src, size_t n)
{
# ifdef PDC_FORCE_UTF8
size_t i = 0;
size_t i = 0, count = 1;

assert( src);
assert( dest);
if (!src || !dest)
return 0;

while( i + 4 < n && *src)
i += PDC_wc_to_utf8( dest + i, *src++);
while( i < n && *src)
while( count && i + 4 < n && *src)
i += (count = PDC_wc_to_utf8( dest + i, *src++));
while( count && i < n && *src)
{
char tbuff[4];
size_t count = (size_t)PDC_wc_to_utf8( tbuff, *src++);

assert( count <= n - i); /* partial UTF-8 decoding indicates error */
count = (size_t)PDC_wc_to_utf8( tbuff, *src++);
assert( count <= n - i); /* don't go past end of buffer */
if( count > n - i)
count = n - i;
memcpy( dest + i, tbuff, count);
i += count;
}
if( !count) /* invalid UTF-8 sequence encountered */
return (size_t)-1;
# else
size_t i = wcstombs(dest, src, n);
if( i == (size_t)-1) /* a character the locale cannot encode */
return i;
# endif
dest[i] = '\0';
return i;
Expand Down