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

Reorder operations to align with exception model in qarraydataops.h

Browse Source 
Fixed order of certain operations to better handle situations when
exceptions occur

Change-Id: Ia2075c37b4b7653067dfa6a82252cbb12b96708f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Andrei Golubev 2020-07-30 11:50:01 +02:00
parent 56f1208f9e
commit 0bd647fa4f
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/corelib/tools/qarraydataops.h
View File

@ -495,13 +495,17 @@ struct QGenericArrayOps
// Construct new elements in array
while (writeIter != step1End) {
--readIter, --writeIter;
new (writeIter) T(*readIter);
--readIter;
// If exception happens on construction, we should not call ~T()
new (writeIter - 1) T(*readIter);
--writeIter;
}
while (writeIter != end) {
--e, --writeIter;
new (writeIter) T(*e);
--e;
// If exception happens on construction, we should not call ~T()
new (writeIter - 1) T(*e);
--writeIter;
}
destroyer.commit();
@ -538,13 +542,17 @@ struct QGenericArrayOps
// Construct new elements in array
while (writeIter != step1End) {
--readIter, --writeIter;
new (writeIter) T(*readIter);
--readIter;
// If exception happens on construction, we should not call ~T()
new (writeIter - 1) T(*readIter);
--writeIter;
}
while (writeIter != end) {
--n, --writeIter;
new (writeIter) T(t);
--n;
// If exception happens on construction, we should not call ~T()
new (writeIter - 1) T(t);
--writeIter;
}
destroyer.commit();
@ -597,8 +605,9 @@ struct QGenericArrayOps
// destroy the final elements at the end
// here, b points to the new end and e to the actual end
do {
(--e)->~T();
// Exceptions or not, dtor called once per instance
--this->size;
(--e)->~T();
} while (e != b);
}