diff options
| author | Sebastian Berg <sebastianb@nvidia.com> | 2023-02-22 19:10:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-22 19:10:06 +0100 |
| commit | b175756dd358f659a0249461934cae37bae534f3 (patch) | |
| tree | d8b619bcb92f0f87ffd6052f657ae6078dc01bc5 /tools | |
| parent | ef336efec4c31da909f3091dce6f998dbe6e3861 (diff) | |
| parent | 5ea81775e0d2d13a4fec6bab882002e050bd3da1 (diff) | |
| download | numpy-b175756dd358f659a0249461934cae37bae534f3.tar.gz | |
Merge pull request #16604 from Iamsoto/bugfix_16492_segfault_on_pyfragments
BUG: SWIG overloaded long functions on pyfragments.swg will seg fault
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/swig/pyfragments.swg | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/swig/pyfragments.swg b/tools/swig/pyfragments.swg index eac817322..6d3e6ff41 100644 --- a/tools/swig/pyfragments.swg +++ b/tools/swig/pyfragments.swg @@ -52,6 +52,7 @@ } %#endif if (!PyArray_IsScalar(obj,Integer)) return SWIG_TypeError; + if (!val) return SWIG_OK; PyArray_Descr * longDescr = PyArray_DescrFromType(NPY_LONG); PyArray_CastScalarToCtype(obj, (void*)val, longDescr); Py_DECREF(longDescr); @@ -102,6 +103,7 @@ } %#endif if (!PyArray_IsScalar(obj,Integer)) return SWIG_TypeError; + if (!val) return SWIG_OK; PyArray_Descr * ulongDescr = PyArray_DescrFromType(NPY_ULONG); PyArray_CastScalarToCtype(obj, (void*)val, ulongDescr); Py_DECREF(ulongDescr); |