From 2b38b23a5ef6299ed34f1dea050cc9406e079ff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20W=C5=82ostowski?= <tomasz.wlostowski@cern.ch>
Date: Wed, 22 May 2019 21:35:03 +0200
Subject: [PATCH] eemodern: fixed use-after-free crash in
 LIB_EDIT_TOOL::DoDelete()

---
 eeschema/tools/lib_edit_tool.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/eeschema/tools/lib_edit_tool.cpp b/eeschema/tools/lib_edit_tool.cpp
index ddb60d9e0f..f18532beea 100644
--- a/eeschema/tools/lib_edit_tool.cpp
+++ b/eeschema/tools/lib_edit_tool.cpp
@@ -272,6 +272,8 @@ int LIB_EDIT_TOOL::DoDelete( const TOOL_EVENT& aEvent )
 
     saveCopyInUndoList( part, UR_LIBEDIT );
 
+    std::set<LIB_ITEM *> toDelete;
+
     for( EDA_ITEM* item : items )
     {
         if( item->Type() == LIB_PIN_T )
@@ -279,7 +281,7 @@ int LIB_EDIT_TOOL::DoDelete( const TOOL_EVENT& aEvent )
             LIB_PIN*  pin = static_cast<LIB_PIN*>( item );
             wxPoint   pos = pin->GetPosition();
 
-            part->RemoveDrawItem( pin );
+            toDelete.insert( pin );
 
             // when pin editing is synchronized, all pins of the same body style are removed:
             if( m_frame->SynchronizePins() )
@@ -298,16 +300,21 @@ int LIB_EDIT_TOOL::DoDelete( const TOOL_EVENT& aEvent )
                     if( pin->GetConvert() != curr_convert )
                         continue;
 
-                    part->RemoveDrawItem( pin );
+                    toDelete.insert( pin );
                 }
             }
         }
         else
         {
-            part->RemoveDrawItem( (LIB_ITEM*) item );
+            toDelete.insert( (LIB_ITEM*) item );
         }
     }
 
+    for( auto item : toDelete )
+    {
+        part->RemoveDrawItem( item );
+    }
+
     m_frame->RebuildView();
     m_frame->OnModify();