From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 21 Sep 2016 12:13:14 +0000 (+0200)
Subject: Fix PyUnicode_FromFormatV() error handling
X-Git-Tag: v3.6.0b2~148^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ddf53d496a3b7bd09fe8672daa2f07a4d240f2c;p=python

Fix PyUnicode_FromFormatV() error handling

Issue #28233: Fix a memory leak if the format string contains a non-ASCII
character, destroy the unicode writer.
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index af045646c8..176ec13616 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -2719,7 +2719,7 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)
                         "PyUnicode_FromFormatV() expects an ASCII-encoded format "
                         "string, got a non-ASCII byte: 0x%02x",
                         (unsigned char)*p);
-                    return NULL;
+                    goto fail;
                 }
                 p++;
             }