diff options
author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-11-17 14:56:08 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-11-17 14:37:28 +0000 |
commit | 1173d48149a8133b607894b67e1ec32de68e21e8 (patch) | |
tree | 0f4e6e33d0808654544ea5b37803961a3c8e73fb /src/core/permission_manager_qt.cpp | |
parent | a6ae4526a390e7f53fbdb66bcb1d2c62816e3f95 (diff) |
Fix crash in PermissionManagerQt
std::vector::erase invalidates the end() iterator.
We must not cache end().
This fixes crashes of tst_qwebenginepage::geolocationRequestJS on
Windows.
Change-Id: Ie2c28c413947bb9ee6580625e07b9d3099d69b06
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/core/permission_manager_qt.cpp')
-rw-r--r-- | src/core/permission_manager_qt.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/permission_manager_qt.cpp b/src/core/permission_manager_qt.cpp index d89b530ee..b322e507e 100644 --- a/src/core/permission_manager_qt.cpp +++ b/src/core/permission_manager_qt.cpp @@ -78,8 +78,7 @@ void PermissionManagerQt::permissionRequestReply(const QUrl &origin, BrowserCont m_permissions[key] = reply; content::PermissionStatus status = reply ? content::PERMISSION_STATUS_GRANTED : content::PERMISSION_STATUS_DENIED; auto it = m_requests.begin(); - const auto end = m_requests.end(); - while (it != end) { + while (it != m_requests.end()) { if (it->origin == origin && it->type == type) { it->callback.Run(status); it = m_requests.erase(it); @@ -133,8 +132,7 @@ void PermissionManagerQt::CancelPermissionRequest(content::PermissionType permis // Should we add API to cancel permissions in the UI level? const QUrl origin = toQt(requesting_origin); auto it = m_requests.begin(); - const auto end = m_requests.end(); - while (it != end) { + while (it != m_requests.end()) { if (it->id == request_id && it->type == permissionType && it->origin == origin) { m_requests.erase(it); return; |