From 1173d48149a8133b607894b67e1ec32de68e21e8 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 17 Nov 2015 14:56:08 +0100 Subject: 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 --- src/core/permission_manager_qt.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src') 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; -- cgit v1.2.3