Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix issue with array comparison reference

Browse source
This commit is contained in:
Mike Precup 2025-07-09 15:12:20 -07:00
parent d7cc121e64
commit 25115609ff
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/templates/sort_array.h
View file

@ -168,17 +168,17 @@ public:
inline int64_t partitioner(int64_t p_first, int64_t p_last, int64_t p_pivot, T *p_array) const { inline int64_t partitioner(int64_t p_first, int64_t p_last, int64_t p_pivot, T *p_array) const {
const int64_t unmodified_first = p_first; const int64_t unmodified_first = p_first;
const int64_t unmodified_last = p_last; const int64_t unmodified_last = p_last;
const T &pivot_element = p_array[p_pivot]; const T *pivot_element_location = &p_array[p_pivot];
while (true) { while (true) {
while (p_first != p_pivot && compare(p_array[p_first], pivot_element)) { while (p_first != p_pivot && compare(p_array[p_first], *pivot_element_location)) {
if constexpr (Validate) { if constexpr (Validate) {
ERR_BAD_COMPARE(p_first == unmodified_last - 1); ERR_BAD_COMPARE(p_first == unmodified_last - 1);
} }
p_first++; p_first++;
} }
p_last--; p_last--;
while (p_last != p_pivot && compare(pivot_element, p_array[p_last])) { while (p_last != p_pivot && compare(*pivot_element_location, p_array[p_last])) {
if constexpr (Validate) { if constexpr (Validate) {
ERR_BAD_COMPARE(p_last == unmodified_first); ERR_BAD_COMPARE(p_last == unmodified_first);
} }
@ -189,6 +189,11 @@ public:
return p_first; return p_first;
} }
if (pivot_element_location == &p_array[p_first]) {
pivot_element_location = &p_array[p_last];
} else if (pivot_element_location == &p_array[p_last]) {
pivot_element_location = &p_array[p_first];
}
SWAP(p_array[p_first], p_array[p_last]); SWAP(p_array[p_first], p_array[p_last]);
p_first++; p_first++;
} }