traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mark Hammond: 

Fixes the MBCS codec to work correctly with zero length strings.
This commit is contained in:
Guido van Rossum 2000-05-03 11:03:24 +00:00
parent 69652f8abe
commit a6edfd9737
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Objects/unicodeobject.c
View File

@ -1555,7 +1555,7 @@ PyObject *PyUnicode_DecodeMBCS(const char *s,
/* First get the size of the result */ /* First get the size of the result */
DWORD usize = MultiByteToWideChar(CP_ACP, 0, s, size, NULL, 0); DWORD usize = MultiByteToWideChar(CP_ACP, 0, s, size, NULL, 0);
if (usize==0) if (size > 0 && usize==0)
return PyErr_SetFromWindowsErrWithFilename(0, NULL); return PyErr_SetFromWindowsErrWithFilename(0, NULL);
v = _PyUnicode_New(usize); v = _PyUnicode_New(usize);
@ -1578,9 +1578,14 @@ PyObject *PyUnicode_EncodeMBCS(const Py_UNICODE *p,
{ {
PyObject *repr; PyObject *repr;
char *s; char *s;
DWORD mbcssize;
/* If there are no characters, bail now! */
if (size==0)
return PyString_FromString("");
/* First get the size of the result */ /* First get the size of the result */
DWORD mbcssize = WideCharToMultiByte(CP_ACP, 0, p, size, NULL, 0, NULL, NULL); mbcssize = WideCharToMultiByte(CP_ACP, 0, p, size, NULL, 0, NULL, NULL);
if (mbcssize==0) if (mbcssize==0)
return PyErr_SetFromWindowsErrWithFilename(0, NULL); return PyErr_SetFromWindowsErrWithFilename(0, NULL);