Issue #14687: Avoid an useless duplicated string in PyUnicode_Format()

b80e46ec · Victor Stinner · aff3cc65 · b80e46ec
Commit b80e46ec authored Apr 30, 2012 by Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 11 deletions

Objects/unicodeobject.c Objects/unicodeobject.c +7 -11

No files found.
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -14051,20 +14051,16 @@ PyUnicode_Format(PyObject *format, PyObject *args)
                }
            }
            /* Copy all characters, preserving len */
-            if (temp != NULL) {
+            if (pindex == 0 && len == PyUnicode_GET_LENGTH(temp)) {
-                assert(pbuf == PyUnicode_DATA(temp));
+                r = _PyAccu_Accumulate(&acc, temp);
-                v = PyUnicode_Substring(temp, pindex, pindex + len);
            }
            else {
-                const char *p = (const char *) pbuf;
+                v = PyUnicode_Substring(temp, pindex, pindex + len);
-                assert(pbuf != NULL);
+                if (v == NULL)
-                p += kind * pindex;
+                    goto onError;
-                v = PyUnicode_FromKindAndData(kind, p, len);
+                r = _PyAccu_Accumulate(&acc, v);
+                Py_DECREF(v);
            }
-            if (v == NULL)
-                goto onError;
-            r = _PyAccu_Accumulate(&acc, v);
-            Py_DECREF(v);
            if (r)
                goto onError;
            if (width > len && repeat_accumulate(&acc, blank, width - len))