Merge pull request #2993 from jkseppan/tri-null-pointer

Avoid a null-pointer dereference in _tri.cpp
matplotlib · Apr 22, 2014 · a809ef9 · a809ef9
2 parents 8429b1e + 613a5c6
commit a809ef9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/matplotlib/tri/_tri.cpp b/lib/matplotlib/tri/_tri.cpp
@@ -1371,7 +1371,7 @@ TrapezoidMapTriFinder::find_many(const Py::Tuple& args)
     PyArrayObject* y = (PyArrayObject*)PyArray_ContiguousFromObject(
                            args[1].ptr(), PyArray_DOUBLE, 0, 0);
     bool ok = (x != 0 && y != 0 && PyArray_NDIM(x) == PyArray_NDIM(y));
-    int ndim = PyArray_NDIM(x);
+    int ndim = x == 0 ? 0 : PyArray_NDIM(x);
     for (int i = 0; ok && i < ndim; ++i)
         ok = (PyArray_DIM(x,i) == PyArray_DIM(y,i));