Revision: 5201 http://geany.svn.sourceforge.net/geany/?rev=5201&view=rev Author: ntrel Date: 2010-08-25 17:00:38 +0000 (Wed, 25 Aug 2010)

Log Message: ----------- Backport list box memory leak fixes from Scintilla 2.20.

Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/PlatGTK.cxx

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-08-25 16:40:47 UTC (rev 5200) +++ trunk/ChangeLog 2010-08-25 17:00:38 UTC (rev 5201) @@ -9,6 +9,8 @@ regex support is required. * tagmanager/make.c: Backport fix for possible infinite loop from CTags. + * scintilla/PlatGTK.cxx: + Backport list box memory leak fixes from Scintilla 2.20.

2010-08-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/scintilla/PlatGTK.cxx =================================================================== --- trunk/scintilla/PlatGTK.cxx 2010-08-25 16:40:47 UTC (rev 5200) +++ trunk/scintilla/PlatGTK.cxx 2010-08-25 17:00:38 UTC (rev 5201) @@ -2245,8 +2245,10 @@ gchar *s; gtk_tree_model_get(model, &iter, TEXT_COLUMN, &s, -1); if (s && (0 == strncmp(prefix, s, strlen(prefix)))) { + g_free(s); return i; } + g_free(s); valid = gtk_tree_model_iter_next(model, &iter) != FALSE; i++; } @@ -2267,6 +2269,7 @@ } else { value[0] = '\0'; } + g_free(text); }

// g_return_if_fail causes unnecessary compiler warning in release compile.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.