From 12e6f8281cd070dc25b374161daef792943146a2 Mon Sep 17 00:00:00 2001
From: Sebastian Ramacher <s.ramacher@gmx.at>
Date: Tue, 21 Dec 2010 14:40:05 +0100
Subject: [PATCH] Fix some memory problems in search

---
 zathura.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/zathura.c b/zathura.c
index 0d3432c..f209d81 100644
--- a/zathura.c
+++ b/zathura.c
@@ -1854,7 +1854,7 @@ search(void* parameter)
   static char* search_item;
   static int direction;
   static int next_page = 0;
-  gchar* old_query;
+  gchar* old_query = NULL;
   int page_counter;
   GList* results = NULL;
 
@@ -1933,6 +1933,9 @@ search(void* parameter)
     }
   }
 
+  g_free(argument->data);
+  g_free(argument);
+
   /* draw results */
   if(results)
   {
@@ -2295,8 +2298,11 @@ sc_search(Argument* argument)
     g_static_mutex_lock(&(Zathura.Lock.search_lock));
   }
 
+  Argument* newarg = g_malloc0(sizeof(Argument));
+  newarg->n = argument->n;
+  newarg->data = argument->data ? g_strdup(argument->data) : NULL;
   Zathura.Thread.search_thread_running = TRUE;
-  Zathura.Thread.search_thread = g_thread_create(search, (gpointer) argument, TRUE, NULL);
+  Zathura.Thread.search_thread = g_thread_create(search, (gpointer) newarg, TRUE, NULL);
   g_static_mutex_unlock(&(Zathura.Lock.search_lock));
 }
 
@@ -4009,8 +4015,10 @@ scmd_search(gchar* input, Argument* argument)
   if(!input || !strlen(input))
     return TRUE;
 
-  argument->data = g_strdup(input);
-  sc_search(argument);
+  Argument* newarg = g_malloc0(sizeof(argument));
+  newarg->n = argument->n;
+  newarg->data = g_strdup(input);
+  sc_search(newarg);
 
   return TRUE;
 }