Merge

af1301a3 · Antoine Pitrou · bcb17071 · 5c68d8a0 · af1301a3
Commit af1301a3 authored Apr 06, 2013 by Antoine Pitrou
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

Python/compile.c Python/compile.c +5 -2

No files found.
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -248,8 +248,11 @@ _Py_Mangle(PyObject *privateobj, PyObject *ident)
    }
    plen -= ipriv;

-    assert(1 <= PY_SSIZE_T_MAX - nlen);
-    assert(1 + nlen <= PY_SSIZE_T_MAX - plen);
+    if (plen + nlen >= PY_SSIZE_T_MAX - 1) {
+        PyErr_SetString(PyExc_OverflowError,
+                        "private identifier too large to be mangled");
+        return NULL;
+    }

    maxchar = PyUnicode_MAX_CHAR_VALUE(ident);
    if (PyUnicode_MAX_CHAR_VALUE(privateobj) > maxchar)