]> granicus.if.org Git - python/commitdiff
Since PyUnicode_AsString is a public API, don't just assert, but do
authorNeal Norwitz <nnorwitz@gmail.com>
Sat, 25 Aug 2007 01:04:21 +0000 (01:04 +0000)
committerNeal Norwitz <nnorwitz@gmail.com>
Sat, 25 Aug 2007 01:04:21 +0000 (01:04 +0000)
a regular check and return an error if not unicode.

Objects/unicodeobject.c

index 157ea1cf5b1876f2295b4884b04473cd56d79fcf..e227fc72d2764fcd098acbd567a745b0fdc2ed2d 100644 (file)
@@ -1204,7 +1204,10 @@ PyObject *_PyUnicode_AsDefaultEncodedString(PyObject *unicode,
 char*
 PyUnicode_AsString(PyObject *unicode)
 {
-    assert(PyUnicode_Check(unicode));
+    if (!PyUnicode_Check(unicode)) {
+        PyErr_BadArgument();
+        return NULL;
+    }
     unicode = _PyUnicode_AsDefaultEncodedString(unicode, NULL);
     if (!unicode)
         return NULL;