From a7e859fcde6643d5f45885bcb8c8a3b8445816a8 Mon Sep 17 00:00:00 2001 From: Tim Edwards Date: Mon, 20 Nov 2023 10:38:41 -0500 Subject: [PATCH] Corrected an error in parallel_sort and series_sort that does not move to the start index before relinking the sorted entries. That will cause properties to be lost whenever the start index is greater than zero. Not sure why this hasn't been caught previously, or whether other errors are involved here. --- VERSION | 2 +- base/netcmp.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7defbbd..c6fad45 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.262 +1.5.263 diff --git a/base/netcmp.c b/base/netcmp.c index 1c9e81a..94e52a8 100644 --- a/base/netcmp.c +++ b/base/netcmp.c @@ -4331,6 +4331,7 @@ void series_sort(struct objlist *ob1, struct nlist *tp1, int idx1, int run) // Re-sort list obp = ob1; + for (i = 0; i < idx1; i++) obp = obp->next; for (i = 0; i < run; i++) { obp->next = proplist[i].ob; obp = obp->next; @@ -4534,6 +4535,7 @@ void parallel_sort(struct objlist *ob1, struct nlist *tp1, int idx1, int run) // Re-sort list obp = ob1; + for (i = 0; i < idx1; i++) obp = obp->next; for (i = 0; i < run; i++) { obp->next = proplist[i].ob; obp = obp->next;