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

QArrayDataPointer: add missing Q_CHECK_PTR check in assign()

Browse Source 
The previous implementation of iterator-assign did not include a check
for the return value of QArrayData::allocate(~), which returns a nullptr
on failure.

Amends: bbbe5f45c4d354ef977d4e09459ef5ae4d6db0da.

Change-Id: I219e63ecd6de4225364d9c3dd2006ddbbe47068f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
This commit is contained in:
Dennis Oberst 2023-05-30 17:22:07 +02:00
parent 574cf24a65
commit 2d77051f9d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/tools/qarraydatapointer.h
View File

@ -320,10 +320,12 @@ public:
const qsizetype n = std::distance(first, last); const qsizetype n = std::distance(first, last);
if (needsDetach() || n > constAllocatedCapacity()) { if (needsDetach() || n > constAllocatedCapacity()) {
QArrayDataPointer allocated(Data::allocate(detachCapacity(n))); QArrayDataPointer allocated(Data::allocate(detachCapacity(n)));
Q_CHECK_PTR(allocated.data());
swap(allocated); swap(allocated);
} }
} else if (needsDetach()) { } else if (needsDetach()) {
QArrayDataPointer allocated(Data::allocate(allocatedCapacity())); QArrayDataPointer allocated(Data::allocate(allocatedCapacity()));
Q_CHECK_PTR(allocated.data());
swap(allocated); swap(allocated);
// We don't want to copy data that we know we'll overwrite // We don't want to copy data that we know we'll overwrite
} }