From ceee8d554afe135729684912ab9314301510dc24 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sun, 24 Feb 2019 20:18:53 +0100
Subject: [PATCH] Fix invalid iterator access in wxTaskBarButton

Iterators are invalid after they are deleted. Store the value before
deleting.

Reuse code of RemoveThumbBarButton.

Closes https://github.com/wxWidgets/wxWidgets/pull/1240
---
 src/msw/taskbarbutton.cpp | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/msw/taskbarbutton.cpp b/src/msw/taskbarbutton.cpp
index c7df79b056..7aa6719890 100644
--- a/src/msw/taskbarbutton.cpp
+++ b/src/msw/taskbarbutton.cpp
@@ -882,20 +882,7 @@ bool wxTaskBarButtonImpl::InsertThumbBarButton(size_t pos,
 wxThumbBarButton* wxTaskBarButtonImpl::RemoveThumbBarButton(
     wxThumbBarButton *button)
 {
-    for ( wxThumbBarButtons::iterator iter = m_thumbBarButtons.begin();
-          iter != m_thumbBarButtons.end();
-          ++iter )
-    {
-        if ( button == *iter )
-        {
-            m_thumbBarButtons.erase(iter);
-            button->SetParent(NULL);
-            InitOrUpdateThumbBarButtons();
-            return *iter;
-        }
-    }
-
-    return NULL;
+    return RemoveThumbBarButton(button->GetID());
 }
 
 wxThumbBarButton* wxTaskBarButtonImpl::RemoveThumbBarButton(int id)
@@ -904,12 +891,13 @@ wxThumbBarButton* wxTaskBarButtonImpl::RemoveThumbBarButton(int id)
           iter != m_thumbBarButtons.end();
           ++iter )
     {
-        if ( id == (*iter)->GetID() )
+        wxThumbBarButton* button = *iter;
+        if ( id == button->GetID() )
         {
             m_thumbBarButtons.erase(iter);
-            (*iter)->SetParent(NULL);
+            button->SetParent(NULL);
             InitOrUpdateThumbBarButtons();
-            return *iter;
+            return button;
         }
     }
 
@@ -1391,10 +1379,11 @@ wxTaskBarJumpListImpl::RemoveCustomCategory(const wxString& title)
           it != m_customCategories.end();
           ++it )
     {
-        if ( (*it)->GetTitle() == title )
+        wxTaskBarJumpListCategory* tbJlCat = *it;
+        if ( tbJlCat->GetTitle() == title )
         {
             m_customCategories.erase(it);
-            return *it;
+            return tbJlCat;
         }
     }