Merge 3.6

1 files changed, 13 insertions, 9 deletions

diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 16b4fd7a90..693da5cc28 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -798,18 +798,22 @@ bytearray_init(PyByteArrayObject *self, PyObject *args, PyObject *kwds)
     if (PyIndex_Check(arg)) {
         count = PyNumber_AsSsize_t(arg, PyExc_OverflowError);
         if (count == -1 && PyErr_Occurred()) {
-            return -1;
-        }
-        if (count < 0) {
-            PyErr_SetString(PyExc_ValueError, "negative count");
-            return -1;
+            if (PyErr_ExceptionMatches(PyExc_OverflowError))
+                return -1;
+            PyErr_Clear();  /* fall through */
         }
-        if (count > 0) {
-            if (PyByteArray_Resize((PyObject *)self, count))
+        else {
+            if (count < 0) {
+                PyErr_SetString(PyExc_ValueError, "negative count");
                 return -1;
-            memset(PyByteArray_AS_STRING(self), 0, count);
+            }
+            if (count > 0) {
+                if (PyByteArray_Resize((PyObject *)self, count))
+                    return -1;
+                memset(PyByteArray_AS_STRING(self), 0, count);
+            }
+            return 0;
         }
-        return 0;
     }
 
     /* Use the buffer API */