mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

PyUnicode_New() sets utf8_length to zero for latin1

Browse source
This commit is contained in:
Victor Stinner 2011-10-04 01:02:02 +02:00
parent 016980454e
commit 9e9d689d85
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Objects/unicodeobject.c
View file

@ -755,7 +755,7 @@ PyUnicode_New(Py_ssize_t size, Py_UCS4 maxchar)
PyCompactUnicodeObject *unicode; PyCompactUnicodeObject *unicode;
void *data; void *data;
int kind_state; int kind_state;
int is_sharing = 0, is_ascii = 0; int is_sharing, is_ascii;
Py_ssize_t char_size; Py_ssize_t char_size;
Py_ssize_t struct_size; Py_ssize_t struct_size;
@ -769,6 +769,8 @@ PyUnicode_New(Py_ssize_t size, Py_UCS4 maxchar)
++unicode_new_new_calls; ++unicode_new_new_calls;
#endif #endif
is_ascii = 0;
is_sharing = 0;
struct_size = sizeof(PyCompactUnicodeObject); struct_size = sizeof(PyCompactUnicodeObject);
if (maxchar < 128) { if (maxchar < 128) {
kind_state = PyUnicode_1BYTE_KIND; kind_state = PyUnicode_1BYTE_KIND;
@ -833,11 +835,12 @@ PyUnicode_New(Py_ssize_t size, Py_UCS4 maxchar)
((char*)data)[size] = 0; ((char*)data)[size] = 0;
_PyUnicode_WSTR(unicode) = NULL; _PyUnicode_WSTR(unicode) = NULL;
_PyUnicode_WSTR_LENGTH(unicode) = 0; _PyUnicode_WSTR_LENGTH(unicode) = 0;
unicode->utf8_length = 0;
unicode->utf8 = NULL; unicode->utf8 = NULL;
unicode->utf8_length = 0;
} }
else { else {
unicode->utf8 = NULL; unicode->utf8 = NULL;
unicode->utf8_length = 0;
if (kind_state == PyUnicode_2BYTE_KIND) if (kind_state == PyUnicode_2BYTE_KIND)
((Py_UCS2*)data)[size] = 0; ((Py_UCS2*)data)[size] = 0;
else /* kind_state == PyUnicode_4BYTE_KIND */ else /* kind_state == PyUnicode_4BYTE_KIND */