summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/tools
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2024-01-27 10:38:32 +0100
committerMarc Mutz <marc.mutz@qt.io>2024-02-02 15:35:51 +0100
commit9219e8ff1d13a7e9aeb595d60aa4b3767a8941fc (patch)
treea0958931a08e3c28b34e69cdd0d5aa5cabc93787 /tests/auto/corelib/tools
parent1b3c8d6e95a81d307a9f7bb556aabcf7fea04588 (diff)
QBitArray: don't create invalid Qt 5 streams
Qt 5 streams cannot handle QBitArrays with more than INT_MAX bits, even on 64-bit platforms, because of interface constraints (size_type int). Qt 6 can, so make sure to refuse serialization of oversized QBitArrays to Qt-5-compatible streams. [ChangeLog][QtCore][QBitArray] Now refuses to stream a QBitArray with size() > INT_MAX to a Qt-5-compatible QDataStream. Pick-to: 6.7 6.6 6.5 6.2 Change-Id: I263e27bd366757c8e0360dfd337948c44d00647a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests/auto/corelib/tools')
-rw-r--r--tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp b/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
index 7f33c6060b..21e6424651 100644
--- a/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
+++ b/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
@@ -94,8 +94,9 @@ void tst_QBitArray::canHandleIntMaxBits()
});
try {
- constexpr int Size1 = INT_MAX - 2;
- constexpr int Size2 = Size1 + 2;
+ constexpr qsizetype Size1 = sizeof(void*) > sizeof(int) ? qsizetype(INT_MAX) + 2 :
+ INT_MAX - 2;
+ constexpr qsizetype Size2 = Size1 + 2;
QBitArray ba(Size1, true);
QCOMPARE(ba.size(), Size1);
@@ -108,6 +109,13 @@ void tst_QBitArray::canHandleIntMaxBits()
QCOMPARE(ba.at(Size2 - 1), false);
QByteArray serialized;
+ if constexpr (sizeof(void*) > sizeof(int)) {
+ QDataStream ds(&serialized, QIODevice::WriteOnly);
+ ds.setVersion(QDataStream::Qt_5_15);
+ ds << ba;
+ QCOMPARE(ds.status(), QDataStream::Status::WriteFailed); // ### SizeLimitExceeded
+ serialized.clear();
+ }
{
QDataStream ds(&serialized, QIODevice::WriteOnly);
ds << ba;