evolution r36945 - trunk/mail

[mbarnes svn gnome org]

Author: mbarnes
Date: Mon Dec 29 11:49:26 2008
New Revision: 36945
URL: http://svn.gnome.org/viewvc/evolution?rev=36945&view=rev

Log:
2008-12-29  Matthew Barnes  <mbarnes redhat com>

	** Fixes bug #565857

	* mail/e-searching-tokenizer.c (searcher_next_token):
	The HTMLTokenizer now expects a newly-allocated string from its
	next_token() method, so duplicate the returned string.  This fixes
	a memory leak whereby previously, some implementations of next_token()
	did return a newly-allocated string, some did not.  Those that did
	leaked those strings.



Modified:
   trunk/mail/ChangeLog
   trunk/mail/e-searching-tokenizer.c

Modified: trunk/mail/e-searching-tokenizer.c
==============================================================================
--- trunk/mail/e-searching-tokenizer.c	(original)
+++ trunk/mail/e-searching-tokenizer.c	Mon Dec 29 11:49:26 2008
@@ -811,7 +811,7 @@
 
 	s->current = token = (struct _token *)e_dlist_remhead(&s->output);
 
-	return token?token->tok:NULL;
+	return token ? g_strdup (token->tok) : NULL;
 }
 
 static char *