Skip to content

bpo-36312: Fix decoders for some code pages. #12369

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

Merged
merged 1 commit into from
Mar 20, 2019
Merged

bpo-36312: Fix decoders for some code pages. #12369

Show file tree
Hide file tree
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
9 changes: 9 additions & 0 deletions Lib/test/test_codecs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3163,6 +3163,15 @@ def test_multibyte_encoding(self):
('[\U0010ffff\uDC80]', 'replace', b'[\xf4\x8f\xbf\xbf?]'),
))

def test_code_page_decode_flags(self):
# Issue #36312: For some code pages (e.g. UTF-7) flags for
# MultiByteToWideChar() must be set to 0.
for cp in (50220, 50221, 50222, 50225, 50227, 50229,
*range(57002, 57011+1), 65000):
self.assertEqual(codecs.code_page_decode(cp, b'abc'), ('abc', 3))
self.assertEqual(codecs.code_page_decode(42, b'abc'),
('\uf061\uf062\uf063', 3))

def test_incremental(self):
decoded = codecs.code_page_decode(932, b'\x82', 'strict', False)
self.assertEqual(decoded, ('', 0))
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Windows/2019-03-16-16-51-17.bpo-36312.Niwm-T.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixed decoders for the following code pages: 50220, 50221, 50222, 50225,
50227, 50229, 57002 through 57011, 65000 and 42.
21 changes: 16 additions & 5 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7171,15 +7171,21 @@ decode_code_page_strict(UINT code_page,
const char *in,
int insize)
{
const DWORD flags = decode_code_page_flags(code_page);
DWORD flags = MB_ERR_INVALID_CHARS;
wchar_t *out;
DWORD outsize;

/* First get the size of the result */
assert(insize > 0);
outsize = MultiByteToWideChar(code_page, flags, in, insize, NULL, 0);
if (outsize <= 0)
goto error;
while ((outsize = MultiByteToWideChar(code_page, flags,
in, insize, NULL, 0)) <= 0)
{
if (!flags || GetLastError() != ERROR_INVALID_FLAGS) {
goto error;
}
/* For some code pages (e.g. UTF-7) flags must be set to 0. */
flags = 0;
}

/* Extend a wchar_t* buffer */
Py_ssize_t n = *bufsize; /* Get the current length */
Expand Down Expand Up @@ -7217,7 +7223,7 @@ decode_code_page_errors(UINT code_page,
{
const char *startin = in;
const char *endin = in + size;
const DWORD flags = decode_code_page_flags(code_page);
DWORD flags = MB_ERR_INVALID_CHARS;
/* Ideally, we should get reason from FormatMessage. This is the Windows
2000 English version of the message. */
const char *reason = "No mapping for the Unicode character exists "
Expand Down Expand Up @@ -7275,6 +7281,11 @@ decode_code_page_errors(UINT code_page,
if (outsize > 0)
break;
err = GetLastError();
if (err == ERROR_INVALID_FLAGS && flags) {
/* For some code pages (e.g. UTF-7) flags must be set to 0. */
flags = 0;
continue;
}
if (err != ERROR_NO_UNICODE_TRANSLATION
&& err != ERROR_INSUFFICIENT_BUFFER)
{
Expand Down