commit b153615008570cffb2e5a782d96c2b79db51ea02
author Victor Stinner <victor.stinner@haypocalc.com> Fri Sep 30 02:26:10 2011 +0200
committer Victor Stinner <victor.stinner@haypocalc.com> Fri Sep 30 02:26:10 2011 +0200
tree d6565431a779955c0c6543060951cd6fcca952f7
parent 1fe99a2ea7c0f54b19153fce352be456b2613b94

PyUnicode_CopyCharacters() uses exceptions instead of assertions

Call PyErr_BadInternalCall() if inputs are not unicode strings.

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 065b5e7..a02c222 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -626,8 +626,10 @@
     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;