diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2023-05-13 11:02:49 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-13 11:02:49 -0600 |
| commit | 5187067d7ad176ee3614beab2b99a524dd719aa8 (patch) | |
| tree | 907997d0c294f550193322aaa73237c1a7bcfaa6 /numpy/core/src/npysort/heapsort.cpp | |
| parent | b786189222ac5bf2f4efbb04399261f7f760bc18 (diff) | |
| parent | 81caed6e3c34c4bf4b22b4f6167e816ba2a3f73c (diff) | |
| download | numpy-5187067d7ad176ee3614beab2b99a524dd719aa8.tar.gz | |
Merge branch 'main' into deprecate-find-common-type
Diffstat (limited to 'numpy/core/src/npysort/heapsort.cpp')
| -rw-r--r-- | numpy/core/src/npysort/heapsort.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/numpy/core/src/npysort/heapsort.cpp b/numpy/core/src/npysort/heapsort.cpp index de39367c2..77a4bda74 100644 --- a/numpy/core/src/npysort/heapsort.cpp +++ b/numpy/core/src/npysort/heapsort.cpp @@ -21,7 +21,7 @@ * * The merge sort is *stable*, meaning that equal components * are unmoved from their entry versions, so it can be used to - * implement lexigraphic sorting on multiple keys. + * implement lexicographic sorting on multiple keys. * * The heap sort is included for completeness. */ @@ -55,6 +55,9 @@ npy_heapsort(void *start, npy_intp num, void *varr) PyArrayObject *arr = (PyArrayObject *)varr; npy_intp elsize = PyArray_ITEMSIZE(arr); PyArray_CompareFunc *cmp = PyArray_DESCR(arr)->f->compare; + if (elsize == 0) { + return 0; /* no need for sorting elements of no size */ + } char *tmp = (char *)malloc(elsize); char *a = (char *)start - elsize; npy_intp i, j, l; |