Issue #5334: array.fromfile() failed to insert values when EOFError was raised.
Reviewed by Benjamin Peterson.
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index e55c2d0..b39da8e 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1201,6 +1201,7 @@
PyObject *f, *b, *res;
Py_ssize_t itemsize = self->ob_descr->itemsize;
Py_ssize_t n, nbytes;
+ int not_enough_bytes;
if (!PyArg_ParseTuple(args, "On:fromfile", &f, &n))
return NULL;
@@ -1222,12 +1223,7 @@
return NULL;
}
- if (PyBytes_GET_SIZE(b) != nbytes) {
- PyErr_SetString(PyExc_EOFError,
- "read() didn't return enough bytes");
- Py_DECREF(b);
- return NULL;
- }
+ not_enough_bytes = (PyBytes_GET_SIZE(b) != nbytes);
args = Py_BuildValue("(O)", b);
Py_DECREF(b);
@@ -1236,6 +1232,15 @@
res = array_fromstring(self, args);
Py_DECREF(args);
+ if (res == NULL)
+ return NULL;
+
+ if (not_enough_bytes) {
+ PyErr_SetString(PyExc_EOFError,
+ "read() didn't return enough bytes");
+ Py_DECREF(res);
+ return NULL;
+ }
return res;
}