[Goodies-commits] r2197 - in xfce4-dict-plugin/trunk: . panel-plugin

[Enrico Troeger]

Author: enrico
Date: 2006-12-05 11:25:10 +0000 (Tue, 05 Dec 2006)
New Revision: 2197

Modified:
   xfce4-dict-plugin/trunk/ChangeLog
   xfce4-dict-plugin/trunk/panel-plugin/dict.c
Log:
Fixed possible segfault after retrieving the dictionary list from a server.


Modified: xfce4-dict-plugin/trunk/ChangeLog
===================================================================
--- xfce4-dict-plugin/trunk/ChangeLog	2006-12-04 19:10:47 UTC (rev 2196)
+++ xfce4-dict-plugin/trunk/ChangeLog	2006-12-05 11:25:10 UTC (rev 2197)
@@ -1,5 +1,10 @@
 2006-12-04 enrico
 
+	* Fixed possible segfault after retrieving the dictionary list from a server.
+
+
+2006-12-04 enrico
+
 	* Fixed wrong display of panel text entry when panel orientation changed.
 	* Panel text entry grows and shrinks now according to the given size.
 	* Removed dependency on libexo, use exo-open(and some other fallbacks) instead.

Modified: xfce4-dict-plugin/trunk/panel-plugin/dict.c
===================================================================
--- xfce4-dict-plugin/trunk/panel-plugin/dict.c	2006-12-04 19:10:47 UTC (rev 2196)
+++ xfce4-dict-plugin/trunk/panel-plugin/dict.c	2006-12-05 11:25:10 UTC (rev 2197)
@@ -808,6 +808,7 @@
 	gint fd, i;
 	gint max_lines;
 	gchar *buffer = NULL;
+	gchar *answer = NULL;
 	gchar **lines;
 	const gchar *host;
 	gint port;
@@ -824,7 +825,7 @@
 	dict_send_command(fd, "show databases");
 
 	// read all server output
-	buffer = dict_get_answer(fd);
+	answer = buffer = dict_get_answer(fd);
 	close(fd);
 
 	// go to next line
@@ -868,7 +869,7 @@
 	}
 
 	g_strfreev(lines);
-	g_free(buffer);
+	g_free(answer);
 
 	// set the active entry to * because we don't know where the previously selected item now is in
 	// the list and we also don't know whether it exists at all, and I don't walk through the list