Prevent segfault by reordering set_text and completion setup

When set_text is called, an completion in an inconsistent state is triggered.

For example when the CommandBar was used for filtering (ctrl+f) and is then
used for searching (for example "O"), entry_changed will try to cast
current_completion to TagCompletion. This happens because "mode" already
contains the new mode and "current_completion" contains the old value. Thus
the cast results in an nullptr, which in turn causes an segfault.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/command_bar.cc b/src/command_bar.cc
index 432f467..6533373 100644
--- a/src/command_bar.cc
+++ b/src/command_bar.cc
@@ -183,14 +183,13 @@ namespace Astroid {
   }
 
   void CommandBar::start_generic (ustring cmd) {
-    entry.set_text (cmd);
     entry.set_completion (refptr<Gtk::EntryCompletion> ());
     current_completion.reset ();
+
+    entry.set_text (cmd);
   }
 
   void CommandBar::start_searching (ustring searchstring) {
-    entry.set_text (searchstring);
-
     /* set up completion */
     search_completion->load_tags (Db::tags);
     search_completion->load_history ();
@@ -200,17 +199,19 @@ namespace Astroid {
     current_completion = search_completion;
 
     search_completion->color_tags (edit_mode);
-  }
 
-  void CommandBar::start_text_searching (ustring searchstring) {
     entry.set_text (searchstring);
+  }
 
+  void CommandBar::start_text_searching (ustring searchstring) {
     /* set up completion */
     search_completion->load_history ();
     search_completion->orig_text = "";
     search_completion->history_pos = 0;
     entry.set_completion (text_search_completion);
     current_completion = text_search_completion;
+
+    entry.set_text (searchstring);
   }
 
   void CommandBar::start_tagging (ustring tagstring) {