Don't segfault if file reading is somehow faulty

migueldvb · Dec 15, 2009 · 6938cc0 · 6938cc0
1 parent effa092
commit 6938cc0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c
@@ -2786,7 +2786,7 @@ PyArray_ArangeObj(PyObject *start, PyObject *stop, PyObject *step, PyArray_Descr
     /* calculate the length and next = start + step*/
     length = _calc_length(start, stop, step, &next,
                           PyTypeNum_ISCOMPLEX(dtype->type_num));
-    err = PyErr_Occurred(); 
+    err = PyErr_Occurred();
     if (err) {
         Py_DECREF(dtype);
         if (err && PyErr_GivenExceptionMatches(err, PyExc_OverflowError)) {
@@ -3042,6 +3042,10 @@ PyArray_FromFile(FILE *fp, PyArray_Descr *dtype, intp num, char *sep)
                 (next_element) fromfile_next_element,
                 (skip_separator) fromfile_skip_separator, NULL);
     }
+    if (ret == NULL) {
+        Py_DECREF(dtype);
+        return NULL;
+    }
     if (((intp) nread) < num) {
         /* Realloc memory for smaller number of elements */
         const size_t nsize = NPY_MAX(nread,1)*ret->descr->elsize;