From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 15 Jul 2013 16:22:47 +0000 (+0200)
Subject: Issue #18408: Don't check unicode consistency in _PyUnicode_HAS_UTF8_MEMORY()
X-Git-Tag: v3.4.0a1~204
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e699e5a21869d8ced1726518044faae45dd22b9c;p=thirdparty%2FPython%2Fcpython.git

Issue #18408: Don't check unicode consistency in _PyUnicode_HAS_UTF8_MEMORY()
and _PyUnicode_HAS_WSTR_MEMORY() macros

These macros are called in unicode_dealloc(), whereas the unicode object can be
"inconsistent" if the creation of the object failed.

For example, when unicode_subtype_new() fails on a memory allocation,
_PyUnicode_CheckConsistency() fails with an assertion error because data is
NULL.
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 1a448824f7ab..8ce3f969330e 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -122,16 +122,14 @@ extern "C" {
 /* true if the Unicode object has an allocated UTF-8 memory block
    (not shared with other data) */
 #define _PyUnicode_HAS_UTF8_MEMORY(op)                  \
-    (assert(_PyUnicode_CHECK(op)),                      \
-     (!PyUnicode_IS_COMPACT_ASCII(op)                   \
+    ((!PyUnicode_IS_COMPACT_ASCII(op)                   \
       && _PyUnicode_UTF8(op)                            \
       && _PyUnicode_UTF8(op) != PyUnicode_DATA(op)))
 
 /* true if the Unicode object has an allocated wstr memory block
    (not shared with other data) */
 #define _PyUnicode_HAS_WSTR_MEMORY(op)                  \
-    (assert(_PyUnicode_CHECK(op)),                      \
-     (_PyUnicode_WSTR(op) &&                            \
+    ((_PyUnicode_WSTR(op) &&                            \
       (!PyUnicode_IS_READY(op) ||                       \
        _PyUnicode_WSTR(op) != PyUnicode_DATA(op))))