Fix crash in wxCommandProcessor of capacity N when N-1 commands were undone.

Performing N commands (where N is the maximal number of commands stored by
wxCommandProcessor), undoing N-1 of them and performing another command
resulted in a crash because a dangling pointer was left.

Closes #12027.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/cmdproc.cpp b/src/common/cmdproc.cpp
index 789e950f95abd09ef8ded525709314174572f54d..3d3d024abf2026c5e8c9b878ea5b1483747f11a0 100644 (file)
--- a/src/common/cmdproc.cpp
+++ b/src/common/cmdproc.cpp
@@ -112,18 +112,6 @@ void wxCommandProcessor::Store(wxCommand *command)
 {
     wxCHECK_RET( command, wxT("no command in wxCommandProcessor::Store") );
 
 {
     wxCHECK_RET( command, wxT("no command in wxCommandProcessor::Store") );
 

-    if ( (int)m_commands.GetCount() == m_maxNoCommands )
-    {
-        wxList::compatibility_iterator firstNode = m_commands.GetFirst();
-        wxCommand *firstCommand = (wxCommand *)firstNode->GetData();
-        delete firstCommand;
-        m_commands.Erase(firstNode);
-
-        // Make sure m_lastSavedCommand won't point to freed memory
-        if ( m_lastSavedCommand == firstNode )
-            m_lastSavedCommand = wxList::compatibility_iterator();
-    }
-

     // Correct a bug: we must chop off the current 'branch'
     // so that we're at the end of the command list.
     if (!m_currentCommand)
     // Correct a bug: we must chop off the current 'branch'
     // so that we're at the end of the command list.
     if (!m_currentCommand)


@@ -145,6 +133,18 @@ void wxCommandProcessor::Store(wxCommand *command)
         }
     }
 
         }
     }
 

+    if ( (int)m_commands.GetCount() == m_maxNoCommands )
+    {
+        wxList::compatibility_iterator firstNode = m_commands.GetFirst();
+        wxCommand *firstCommand = (wxCommand *)firstNode->GetData();
+        delete firstCommand;
+        m_commands.Erase(firstNode);
+
+        // Make sure m_lastSavedCommand won't point to freed memory
+        if ( m_lastSavedCommand == firstNode )
+            m_lastSavedCommand = wxList::compatibility_iterator();
+    }
+

     m_commands.Append(command);
     m_currentCommand = m_commands.GetLast();
     SetMenuStrings();
     m_commands.Append(command);
     m_currentCommand = m_commands.GetLast();
     SetMenuStrings();