Merge pull request matplotlib#4624 from cgohlke/patch-2

mdboom · mdboom · commit 382974186f78 · 2015-07-11T09:07:42.000-04:00
Fix segfault on Windows
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -355,7 +355,9 @@ static PyObject *Py_point_in_path_collection(PyObject *self, PyObject *args, PyO
 
     npy_intp dims[] = {(npy_intp)result.size() };
     numpy::array_view<int, 1> pyresult(dims);
-    memcpy(pyresult.data(), &result[0], result.size() * sizeof(int));
+    if (result.size() > 0) {
+        memcpy(pyresult.data(), &result[0], result.size() * sizeof(int));
+    }
     return pyresult.pyobj();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,9 @@ static PyObject Py_point_in_path_collection(PyObject self, PyObject *args, PyO`
`355`	`355`
`356`	`356`	`npy_intp dims[] = {(npy_intp)result.size() };`
`357`	`357`	`numpy::array_view<int, 1> pyresult(dims);`
`358`		`- memcpy(pyresult.data(), &result[0], result.size() * sizeof(int));`
	`358`	`+ if (result.size() > 0) {`
	`359`	`+ memcpy(pyresult.data(), &result[0], result.size() * sizeof(int));`
	`360`	`+ }`
`359`	`361`	`return pyresult.pyobj();`
`360`	`362`	`}`
`361`	`363`