Merge pull request matplotlib#13291 from meeseeksmachine/auto-backport-of-pr-13287-on-v3.0.x

QuLogic · web-flow · commit 5e7a32780793 · 2019-01-26T04:27:33.000-05:00
Backport PR matplotlib#13287 on branch v3.0.x (Fix unsafe use of NULL pointer)
diff --git a/src/file_compat.h b/src/file_compat.h
@@ -95,6 +95,7 @@ static NPY_INLINE FILE *mpl_PyFile_Dup(PyObject *file, char *mode, mpl_off_t *or
 #endif
     if (handle == NULL) {
         PyErr_SetString(PyExc_IOError, "Getting a FILE* from a Python file object failed");
+        return NULL;
     }
 
     /* Record the original raw file handle position */

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ static NPY_INLINE FILE mpl_PyFile_Dup(PyObject file, char mode, mpl_off_t or`
`95`	`95`	`#endif`
`96`	`96`	`if (handle == NULL) {`
`97`	`97`	`PyErr_SetString(PyExc_IOError, "Getting a FILE* from a Python file object failed");`
	`98`	`+ return NULL;`
`98`	`99`	`}`
`99`	`100`
`100`	`101`	`/* Record the original raw file handle position */`