Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix to bug #393 (UTF16 codec didn't like empty strings) and 

corrected some usage of 'unsigned long' where Py_UNICODE
should have been used.
This commit is contained in:
Marc-André Lemburg 2000-07-07 11:27:45 +00:00
parent 295b1bbca1
commit 063e0cb4c6
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Objects/unicodeobject.c
View File

@ -953,14 +953,13 @@ PyObject *PyUnicode_EncodeUTF16(const Py_UNICODE *s,
sizeof(Py_UNICODE) * (size + (byteorder == 0))); sizeof(Py_UNICODE) * (size + (byteorder == 0)));
if (v == NULL) if (v == NULL)
return NULL; return NULL;
if (size == 0)
goto done;
q = PyString_AS_STRING(v); q = PyString_AS_STRING(v);
p = (Py_UNICODE *)q; p = (Py_UNICODE *)q;
if (byteorder == 0) if (byteorder == 0)
*p++ = 0xFEFF; *p++ = 0xFEFF;
if (size == 0)
goto done;
if (byteorder == 0 || if (byteorder == 0 ||
#ifdef BYTEORDER_IS_LITTLE_ENDIAN #ifdef BYTEORDER_IS_LITTLE_ENDIAN
byteorder == -1 byteorder == -1
@ -994,7 +993,7 @@ PyObject *PyUnicode_AsUTF16String(PyObject *unicode)
static static
int unicodeescape_decoding_error(const char **source, int unicodeescape_decoding_error(const char **source,
unsigned long *x, Py_UNICODE *x,
const char *errors, const char *errors,
const char *details) const char *details)
{ {
@ -1009,7 +1008,7 @@ int unicodeescape_decoding_error(const char **source,
return 0; return 0;
} }
else if (strcmp(errors,"replace") == 0) { else if (strcmp(errors,"replace") == 0) {
*x = (unsigned long)Py_UNICODE_REPLACEMENT_CHARACTER; *x = Py_UNICODE_REPLACEMENT_CHARACTER;
return 0; return 0;
} }
else { else {
@ -1063,7 +1062,7 @@ PyObject *PyUnicode_DecodeUnicodeEscape(const char *s,
end = s + size; end = s + size;
while (s < end) { while (s < end) {
unsigned char c; unsigned char c;
unsigned long x; Py_UNICODE x;
int i; int i;
/* Non-escape characters are interpreted as Unicode ordinals */ /* Non-escape characters are interpreted as Unicode ordinals */
@ -1372,7 +1371,7 @@ PyObject *PyUnicode_DecodeRawUnicodeEscape(const char *s,
end = s + size; end = s + size;
while (s < end) { while (s < end) {
unsigned char c; unsigned char c;
unsigned long x; Py_UNICODE x;
int i; int i;
/* Non-escape characters are interpreted as Unicode ordinals */ /* Non-escape characters are interpreted as Unicode ordinals */