[Geany-devel] [PATCH] fix memory leak

[Frank Lanitz]

Hi, 

On Thu, 5 Aug 2010 22:14:15 +0200
Daniel Marjamäki <daniel.marjamaki at gmail.com> wrote:

> I believe this will fix a memory leak in src/search.c. But please
> double-check!
> 
> At lines 1417-1422 the search_text is allocated:
> 	if (enc != NULL && g_utf8_validate(utf8_search_text,
> utf8_text_len, NULL)) {
> 		search_text = g_convert(utf8_search_text,
> utf8_text_len, enc, "UTF-8", NULL, NULL, NULL);
> 	}
> 	if (search_text == NULL)
> 		search_text = g_strdup(utf8_search_text);
> 
> 
> The only usage of search_text between the lines 1417-1456 is:
> 	argv_prefix[i++] = g_strdup(search_text);
> 
> 
> At line 1456 there is this code:
> 	if (argv == NULL)	/* no files */
> 	{
> 		g_strfreev(argv);
> 		return FALSE;
> 	}
> 
> 
> I assume that a "g_free(search_text);" is needed before the return.

I've just committed a patch based on your findings with svn r5145.

However, maybe we should revisit the function as it appears to me at
the moment that search_text could be replaced completely by using
utf8_search_text. 

Cheers, 
Frank
-- 
http://frank.uvena.de/en/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.geany.org/pipermail/devel/attachments/20100812/e276632e/attachment.pgp>