From 4e751c3d12aa93abb0b96603b99b332dfec135b2 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 3 May 2000 12:27:22 +0000 Subject: Mark Hammond withdraws his fix -- the size includes the trailing 0 so a size of 0 *is* illegal. --- Objects/unicodeobject.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index e843d1a..7a68dd4 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -1555,7 +1555,7 @@ PyObject *PyUnicode_DecodeMBCS(const char *s, /* First get the size of the result */ DWORD usize = MultiByteToWideChar(CP_ACP, 0, s, size, NULL, 0); - if (size > 0 && usize==0) + if (usize==0) return PyErr_SetFromWindowsErrWithFilename(0, NULL); v = _PyUnicode_New(usize); @@ -1578,14 +1578,9 @@ PyObject *PyUnicode_EncodeMBCS(const Py_UNICODE *p, { PyObject *repr; char *s; - DWORD mbcssize; - - /* If there are no characters, bail now! */ - if (size==0) - return PyString_FromString(""); /* First get the size of the result */ - mbcssize = WideCharToMultiByte(CP_ACP, 0, p, size, NULL, 0, NULL, NULL); + DWORD mbcssize = WideCharToMultiByte(CP_ACP, 0, p, size, NULL, 0, NULL, NULL); if (mbcssize==0) return PyErr_SetFromWindowsErrWithFilename(0, NULL); -- cgit v0.12