Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-24 14:15:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SEGV to create empty shaped numpy array (#1371)

Browse Source 
Fix a segfault when creating a 0-dimension, c-strides array.
This commit is contained in:
Naotoshi Seo 2018-05-06 13:59:25 +00:00 committed by Wenzel Jakob
parent abf916d845
commit a50125ff85
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/pybind11/numpy.h
View File

@ -764,8 +764,9 @@ protected:
static std::vector<ssize_t> c_strides(const std::vector<ssize_t> &shape, ssize_t itemsize) { static std::vector<ssize_t> c_strides(const std::vector<ssize_t> &shape, ssize_t itemsize) {
auto ndim = shape.size(); auto ndim = shape.size();
std::vector<ssize_t> strides(ndim, itemsize); std::vector<ssize_t> strides(ndim, itemsize);
for (size_t i = ndim - 1; i > 0; --i) if (ndim > 0)
strides[i - 1] = strides[i] * shape[i]; for (size_t i = ndim - 1; i > 0; --i)
strides[i - 1] = strides[i] * shape[i];
return strides; return strides;
} }

3
tests/test_numpy_array.cpp
View File

@ -102,6 +102,9 @@ TEST_SUBMODULE(numpy_array, sm) {
sm.def("make_f_array", [] { return py::array_t<float>({ 2, 2 }, { 4, 8 }); }); sm.def("make_f_array", [] { return py::array_t<float>({ 2, 2 }, { 4, 8 }); });
sm.def("make_c_array", [] { return py::array_t<float>({ 2, 2 }, { 8, 4 }); }); sm.def("make_c_array", [] { return py::array_t<float>({ 2, 2 }, { 8, 4 }); });
// test_empty_shaped_array
sm.def("make_empty_shaped_array", [] { return py::array(py::dtype("f"), {}, {}); });
// test_wrap // test_wrap
sm.def("wrap", [](py::array a) { sm.def("wrap", [](py::array a) {
return py::array( return py::array(

4
tests/test_numpy_array.py
View File

@ -135,6 +135,10 @@ def test_make_c_f_array():
assert not m.make_f_array().flags.c_contiguous assert not m.make_f_array().flags.c_contiguous
def test_make_empty_shaped_array():
m.make_empty_shaped_array()
def test_wrap(): def test_wrap():
def assert_references(a, b, base=None): def assert_references(a, b, base=None):
from distutils.version import LooseVersion from distutils.version import LooseVersion