From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sun, 23 Oct 2011 17:47:19 +0000 (+0200)
Subject: Fix data variable in _PyUnicode_Dump() for compact ASCII
X-Git-Tag: v3.3.0a1~1035
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d60e87ad6d992c8b989dfa1909a2fd8e853ee9a;p=thirdparty%2FPython%2Fcpython.git

Fix data variable in _PyUnicode_Dump() for compact ASCII
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 547c857ac833..82d532fdee70 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)