From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 5 Oct 2018 21:24:25 +0000 (-0700)
Subject: bpo-34899: Fix a possible assertion failure due to int_from_bytes_impl() (GH-9705)
X-Git-Tag: v3.6.7rc2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=526929be39e139a7d89f4c363d79c28566f30d71;p=thirdparty%2FPython%2Fcpython.git

bpo-34899: Fix a possible assertion failure due to int_from_bytes_impl() (GH-9705)


The _PyLong_FromByteArray() call in int_from_bytes_impl() was
unchecked.
(cherry picked from commit 7bb9cd0a6766fd3e7b3c1e8f2315304ae192b34c)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
---

diff --git a/Objects/longobject.c b/Objects/longobject.c
index c3c0949189d8..3864cec97a0a 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -5302,7 +5302,7 @@ long_from_bytes(PyTypeObject *type, PyObject *args, PyObject *kwds)
         little_endian, is_signed);
     Py_DECREF(bytes);
 
-    if (type != &PyLong_Type) {
+    if (long_obj != NULL && type != &PyLong_Type) {
         Py_SETREF(long_obj, PyObject_CallFunctionObjArgs((PyObject *)type,
                                                          long_obj, NULL));
     }