commit be580f2e481f5f129a1e47e436dd7ae54b9f50bd
author Kristján Valur Jónsson <sweskman@gmail.com> Fri Apr 25 09:51:21 2014 +0000
committer Kristján Valur Jónsson <sweskman@gmail.com> Fri Apr 25 09:51:21 2014 +0000
tree 5d8a87352f890238030c6af3b1c8b4c9dcf5c00b
parent 4e0df17bd711af209bd4bfa73def4a5a17317899

Issue #20434 Correct error handlin of _PyString_Resize and _PyBytes_Resize

Objects/stringobject.c

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 83dab08..0b6d36c 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -748,8 +748,8 @@
                              UTF-8 bytes may follow. */
         }
     }
-    if (p-buf < newlen && _PyString_Resize(&v, p - buf))
-        goto failed;
+    if (p-buf < newlen)
+        _PyString_Resize(&v, p - buf); /* v is cleared on error */
     return v;
   failed:
     Py_DECREF(v);