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

JNI: Extract size check from fromContainer

Browse Source 
Addresses header review comment.

Change-Id: I302ae22da197fa8c317f0a4749d15b07fb5d0078
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit b5538a5a0ebf9bd9a155b857c385c764c30eabae)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2025-01-17 18:56:34 +01:00 committed by Qt Cherry-pick Bot
parent 779e5faf1d
commit abf6c88a86
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/kernel/qjniarray.h
View File

@ -480,8 +480,7 @@ public:
template <typename Container, if_compatible_source_container<Container> = true> template <typename Container, if_compatible_source_container<Container> = true>
static auto fromContainer(Container &&container) static auto fromContainer(Container &&container)
{ {
if (!q20::in_range<size_type>(std::size(container))) verifySize(std::size(container));
qWarning("QJniArray::fromContainer: Container is too large for Java and will be truncated!");
using ElementType = typename std::remove_reference_t<Container>::value_type; using ElementType = typename std::remove_reference_t<Container>::value_type;
if constexpr (std::is_base_of_v<std::remove_pointer_t<jobject>, if constexpr (std::is_base_of_v<std::remove_pointer_t<jobject>,
std::remove_pointer_t<ElementType>>) { std::remove_pointer_t<ElementType>>) {
@ -605,6 +604,13 @@ protected:
void swap(QJniArrayBase &other) noexcept { m_object.swap(other.m_object); } void swap(QJniArrayBase &other) noexcept { m_object.swap(other.m_object); }
private: private:
template <typename container_size_type>
static void verifySize(container_size_type size)
{
if (!q20::in_range<size_type>(size))
qWarning("QJniArray::fromContainer: Container is too large for Java and will be truncated!");
}
QJniObject m_object; QJniObject m_object;
}; };