From 67dd4933e6ae5517426de93ce8a3a448eeb48797 Mon Sep 17 00:00:00 2001
From: Jethro Grassie <jtg@xtrabass.com>
Date: Wed, 16 Aug 2017 08:44:52 -0400
Subject: [PATCH] Add sync lock on stop

Also added and moved two free's hoping to fix leaks.
---
 contrib/epee/src/readline_buffer.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/contrib/epee/src/readline_buffer.cpp b/contrib/epee/src/readline_buffer.cpp
index ce8260ef..d4051bcb 100644
--- a/contrib/epee/src/readline_buffer.cpp
+++ b/contrib/epee/src/readline_buffer.cpp
@@ -61,7 +61,8 @@ void rdln::readline_buffer::start()
 
 void rdln::readline_buffer::stop()
 {
-  std::unique_lock<std::mutex> lock(process_mutex);
+  std::unique_lock<std::mutex> lock_process(process_mutex);
+  std::unique_lock<std::mutex> lock_sync(sync_mutex);
   have_line.notify_all();
   if(m_cout_buf == NULL)
     return;
@@ -152,9 +153,7 @@ static int process_input()
 
 static void handle_line(char* line)
 {
-  // This function never gets called now as we are trapping newlines.
-  // However, it still needs to be present for readline to know we are 
-  // manually handling lines.
+  free(line);
   rl_done = 1;
   return;
 }
@@ -166,6 +165,7 @@ static int handle_enter(int x, int y)
 
   line = rl_copy_text(0, rl_end);
   std::string test_line = line;
+  free(line);
   boost::trim_right(test_line);
 
   rl_crlf();
@@ -191,7 +191,6 @@ static int handle_enter(int x, int y)
     add_history(test_line.c_str());
     history_set_pos(history_length);
   }
-  free(line);
 
   if(last_line != "exit" && last_line != "q")
   {