procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 17:33:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

libgimpbase: fix memory leak in gimp_installation_directory().

Browse source 
Argh I should have properly reviewed !392 (commit c264f0b705).
It was leaking the return value of a g_path_get_basename().
This commit is contained in:
Jehan 2021-01-19 12:04:53 +01:00
parent 58b98b941f
commit 1873f0d65c
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libgimpbase/gimpenv.c
View file

@ -399,6 +399,7 @@ gimp_installation_directory (void)
NSAutoreleasePool *pool; NSAutoreleasePool *pool;
NSString *resource_path; NSString *resource_path;
gchar *basename; gchar *basename;
gchar *basepath;
gchar *dirname; gchar *dirname;
pool = [[NSAutoreleasePool alloc] init]; pool = [[NSAutoreleasePool alloc] init];
@ -406,7 +407,8 @@ gimp_installation_directory (void)
resource_path = [[NSBundle mainBundle] resourcePath]; resource_path = [[NSBundle mainBundle] resourcePath];
basename = g_path_get_basename ([resource_path UTF8String]); basename = g_path_get_basename ([resource_path UTF8String]);
dirname = g_path_get_dirname ([resource_path UTF8String]); basepath = g_path_get_dirname ([resource_path UTF8String]);
dirname = g_path_get_basename (basepath);
if (! strcmp (basename, ".libs")) if (! strcmp (basename, ".libs"))
{ {
@ -420,13 +422,13 @@ gimp_installation_directory (void)
* path is the directory which contains the executable * path is the directory which contains the executable
*/ */
toplevel = g_strdup (dirname); toplevel = g_strdup (basepath);
} }
else if (! strcmp (g_path_get_basename (dirname), "plug-ins")) else if (! strcmp (dirname, "plug-ins"))
{ {
/* same for plug-ins in subdirectory, go three levels up from prefix/lib/gimp/x.y */ /* same for plug-ins in subdirectory, go three levels up from prefix/lib/gimp/x.y */
gchar *tmp = g_path_get_dirname (dirname); gchar *tmp = g_path_get_dirname (basepath);
gchar *tmp2 = g_path_get_dirname (tmp); gchar *tmp2 = g_path_get_dirname (tmp);
gchar *tmp3 = g_path_get_dirname (tmp2); gchar *tmp3 = g_path_get_dirname (tmp2);
@ -444,6 +446,7 @@ gimp_installation_directory (void)
} }
g_free (basename); g_free (basename);
g_free (basepath);
g_free (dirname); g_free (dirname);
[pool drain]; [pool drain];