From c6f0df7b2095eaf0a6d5914a043f9062f66d19f7 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 6 Oct 2011 15:58:54 +0200 Subject: Fix PyUnicode_Join() for len==1 and non-exact string --- Objects/unicodeobject.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 2c38ed0..75fc23c 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -9154,6 +9154,7 @@ PyUnicode_Join(PyObject *separator, PyObject *seq) return res; } sep = NULL; + maxchar = 0; } else { /* Set up sep and seplen */ @@ -9203,8 +9204,7 @@ PyUnicode_Join(PyObject *separator, PyObject *seq) goto onError; sz += PyUnicode_GET_LENGTH(item); item_maxchar = PyUnicode_MAX_CHAR_VALUE(item); - if (item_maxchar > maxchar) - maxchar = item_maxchar; + maxchar = Py_MAX(maxchar, item_maxchar); if (i != 0) sz += seplen; if (sz < old_sz || sz > PY_SSIZE_T_MAX) { -- cgit v0.12