Issue #9738, #9836: Fix refleak introduced by r84704

Victor Stinner · Victor Stinner · commit 4c7db315df75 · 2010-09-12T07:51:18.000Z
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
@@ -1397,7 +1397,7 @@ def test_from_format(self):
         # non-ascii format, ascii argument
         self.assertRaisesRegexp(ValueError,
             '^PyUnicode_FromFormatV\(\) expects an ASCII-encoded format '
-            'string, got a non-ascii byte: 0xe9$',
+            'string, got a non-ASCII byte: 0xe9$',
             format_unicode, b'unicode\xe9=%s', 'ascii')
 
 def test_main():
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -767,9 +767,9 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)
          else if (128 <= (unsigned char)*f) {
              PyErr_Format(PyExc_ValueError,
                 "PyUnicode_FromFormatV() expects an ASCII-encoded format "
-                "string, got a non-ascii byte: 0x%02x",
+                "string, got a non-ASCII byte: 0x%02x",
                 (unsigned char)*f);
-             return NULL;
+             goto fail;
          }
     }
     /* step 2: allocate memory for the results of

Original file line number	Diff line number	Diff line change
`@@ -767,9 +767,9 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)`
`767`	`767`	`else if (128 <= (unsigned char)*f) {`
`768`	`768`	`PyErr_Format(PyExc_ValueError,`
`769`	`769`	`"PyUnicode_FromFormatV() expects an ASCII-encoded format "`
`770`		`- "string, got a non-ascii byte: 0x%02x",`
	`770`	`+ "string, got a non-ASCII byte: 0x%02x",`
`771`	`771`	`(unsigned char)*f);`
`772`		`- return NULL;`
	`772`	`+ goto fail;`
`773`	`773`	`}`
`774`	`774`	`}`
`775`	`775`	`/* step 2: allocate memory for the results of`