From 0d60e87ad6d992c8b989dfa1909a2fd8e853ee9a Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sun, 23 Oct 2011 19:47:19 +0200 Subject: [PATCH] Fix data variable in _PyUnicode_Dump() for compact ASCII --- Objects/unicodeobject.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 547c857ac83..82d532fdee7 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -838,14 +838,22 @@ _PyUnicode_Dump(PyObject *op) PyCompactUnicodeObject *compact = (PyCompactUnicodeObject *)op; PyUnicodeObject *unicode = (PyUnicodeObject *)op; void *data; - printf("%s: len=%zu, ",unicode_kind_name(op), ascii->length); + if (ascii->state.compact) - data = (compact + 1); + { + if (ascii->state.ascii) + data = (ascii + 1); + else + data = (compact + 1); + } else data = unicode->data.any; + printf("%s: len=%zu, ",unicode_kind_name(op), ascii->length); + if (ascii->wstr == data) printf("shared "); printf("wstr=%p", ascii->wstr); + if (!(ascii->state.ascii == 1 && ascii->state.compact == 1)) { printf(" (%zu), ", compact->wstr_length); if (!ascii->state.compact && compact->utf8 == unicode->data.any)