From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 25 Oct 2016 07:07:51 +0000 (+0300)
Subject: Issue #28426: Fixed potential crash in PyUnicode_AsDecodedObject() in debug build.
X-Git-Tag: v3.4.6rc1~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77eede35fc4409f3279af0fee91fdfb3fcc5a6ae;p=thirdparty%2FPython%2Fcpython.git

Issue #28426: Fixed potential crash in PyUnicode_AsDecodedObject() in debug build.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 3c117db4c80b..513989afee0e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ Release date: TBA
 Core and Builtins
 -----------------
 
+- Issue #28426: Fixed potential crash in PyUnicode_AsDecodedObject() in debug
+  build.
+
 Library
 -------
 
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 193d898f1b27..7fad69541b3e 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -3059,24 +3059,16 @@ PyUnicode_AsDecodedObject(PyObject *unicode,
                           const char *encoding,
                           const char *errors)
 {
-    PyObject *v;
-
     if (!PyUnicode_Check(unicode)) {
         PyErr_BadArgument();
-        goto onError;
+        return NULL;
     }
 
     if (encoding == NULL)
         encoding = PyUnicode_GetDefaultEncoding();
 
     /* Decode via the codec registry */
-    v = PyCodec_Decode(unicode, encoding, errors);
-    if (v == NULL)
-        goto onError;
-    return unicode_result(v);
-
-  onError:
-    return NULL;
+    return PyCodec_Decode(unicode, encoding, errors);
 }
 
 PyObject *