qiurui
/
qtcoap
mirror of https://github.com/qt/qtcoap.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a crash when adding a QCoapOption to options list 

Due to recent changes, when calling any QList-modifying operations, the
previously saved iterators on the list may be invalidated. Use indexes
instead of iteratots when inserting into the list of QCoapOptions.

Fixes: QTBUG-88729
Change-Id: I73e9bb841594f0dab992fda37fed4ad29081ae7c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
This commit is contained in:
Sona Kurazyan 2020-11-23 10:35:02 +01:00
parent 62d25482b6
commit 432791f618
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/coap/qcoapmessage.cpp
View File

@ -141,14 +141,14 @@ void QCoapMessage::addOption(const QCoapOption &option)
{
Q_D(QCoapMessage);
const auto it = std::upper_bound(d->options.begin(), d->options.end(), option,
[](const QCoapOption &a, const QCoapOption &b) -> bool {
return a.name() < b.name();
});
const auto idx = std::distance(d->options.begin(), it);
// Sort options by ascending order while inserting
d->options.insert(
std::upper_bound(d->options.begin(), d->options.end(), option,
[](const QCoapOption &a, const QCoapOption &b) -> bool {
return a.name() < b.name();
}),
option
);
d->options.insert(idx, option);
}
/*!