Fix crash in BrowserContextAdapter::removeCustomUrlSchemeHandler

Do not cache the end iterator, because erase might invalidate it.
Do not increment the iterator in the erase case.

Change-Id: I1cbad04fdaaf1bf4cfae252bb7569d817b6ab5a5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp
index a6d3dfa4d..4aa34e5d6 100644
--- a/src/core/browser_context_adapter.cpp
+++ b/src/core/browser_context_adapter.cpp
@@ -361,13 +361,13 @@ bool BrowserContextAdapter::removeCustomUrlSchemeHandler(QWebEngineUrlSchemeHand
 {
     bool removedOneOrMore = false;
     auto it = m_customUrlSchemeHandlers.begin();
-    auto end = m_customUrlSchemeHandlers.end();
-    for (; it != end; ++it) {
+    while (it != m_customUrlSchemeHandlers.end()) {
         if (it.value() == handler) {
             it = m_customUrlSchemeHandlers.erase(it);
             removedOneOrMore = true;
             continue;
         }
+        ++it;
     }
     if (removedOneOrMore)
         updateCustomUrlSchemeHandlers();