Skip to content

Reject overlong forms and out-of-range code points in _Mbrtowc #5943

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
AZero13 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Reject overlong forms and out-of-range code points in _Mbrtowc #5943

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
6 changes: 6 additions & 0 deletions stl/src/xmbtowc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,12 @@ _MRTIMP2 _Success_(return >= 0) int __cdecl _Mbrtowc(
}
}

// Reject overlong forms and out-of-range code points (see N4950 [locale.codecvt.virtuals]/3)
if ((consumedCount == 2 && wch < 0x80u) || (consumedCount == 3 && wch < 0x800u) || wch > 0x10FFFFu) {
errno = EILSEQ;
return -1;
}

if (wch >= 0xD800u && wch <= 0xDFFFu) { // tried to decode unpaired surrogate
errno = EILSEQ;
return -1;
Expand Down