asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LocalVector: Don't error if from >= count

Browse source 
Vector handles this silently by returning -1, and we should do the same here.
Otherwise we get errors when calling `find()` on e.g. a LocalVector of size 0,
while `find()` is expected to always work (if the parameters are invalid then
it doesn't find anything, so -1).

Fixup to #49925.

(cherry picked from commit 7b7ccf25b6)
This commit is contained in:
Rémi Verschelde 2021-07-01 12:16:26 +02:00
parent 09b231e15f
commit f0e76377cb
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/local_vector.h
View file

@ -177,7 +177,6 @@ public:
} }
int64_t find(const T &p_val, U p_from = 0) const { int64_t find(const T &p_val, U p_from = 0) const {
ERR_FAIL_UNSIGNED_INDEX_V(p_from, count, -1);
for (U i = p_from; i < count; i++) { for (U i = p_from; i < count; i++) {
if (data[i] == p_val) { if (data[i] == p_val) {
return int64_t(i); return int64_t(i);