From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Fri, 30 Sep 2011 00:26:10 +0000 (+0200)
Subject: PyUnicode_CopyCharacters() uses exceptions instead of assertions
X-Git-Tag: v3.3.0a1~1425
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b153615008570cffb2e5a782d96c2b79db51ea02;p=thirdparty%2FPython%2Fcpython.git

PyUnicode_CopyCharacters() uses exceptions instead of assertions

Call PyErr_BadInternalCall() if inputs are not unicode strings.
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 065b5e76d7e6..a02c2227fc1f 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -626,8 +626,10 @@ PyUnicode_CopyCharacters(PyObject *to, Py_ssize_t to_start,
     unsigned int from_kind, to_kind;
     void *from_data, *to_data;
 
-    assert(PyUnicode_Check(from));
-    assert(PyUnicode_Check(to));
+    if (!PyUnicode_Check(from) || !PyUnicode_Check(to)) {
+        PyErr_BadInternalCall();
+        return -1;
+    }
 
     if (PyUnicode_READY(from))
         return -1;