1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QMinimalFlatSet: fix UB (using op< on pointers) when is_pointer<value_type>

Browse Source 
Using operator< on pointers that are not part of the same array is
UB. We need to use std::less to get a total order, so do that.

The QMinimalFlatSet copy in QtDeclarative is not affected, because
it's only ever instantiated with value_type int.

Change-Id: Ic8cd4852505f3d3ab57039ce26064ed47cac0deb
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Marc Mutz 2024-02-13 16:29:08 +01:00
parent 9afd95eb68
commit 0872212812
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/tools/qminimalflatset_p.h
View File

@ -29,6 +29,7 @@
#endif #endif
#include <algorithm> // for std::lower_bound #include <algorithm> // for std::lower_bound
#include <functional> // for std::less
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -120,8 +121,10 @@ private:
bool exists; bool exists;
}; };
const auto it = std::lower_bound(c.cbegin(), c.cend(), v); auto cmp = std::less<value_type>{};
return R{it, it != c.cend() && !(v < *it)};
const auto it = std::lower_bound(c.cbegin(), c.cend(), v, cmp);
return R{it, it != c.cend() && !cmp(v, *it)};
} }
#ifdef QMINIMAL_FLAT_SET_DEBUG #ifdef QMINIMAL_FLAT_SET_DEBUG