nyje/medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bunch of memory leaks

Browse Source
This commit is contained in:
Yevgen Muntyan 2011-01-25 03:17:10 -08:00
parent d3c4a23fbe
commit d15baaaad2
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moo/mooedit/mooeditfileinfo.c
View File

@ -39,6 +39,8 @@ G_DEFINE_TYPE (MooReloadInfo, moo_reload_info, G_TYPE_OBJECT)
* @encoding: (type const-utf8) (allow-none) (default NULL) * @encoding: (type const-utf8) (allow-none) (default NULL)
* @line: (type index) (default -1) * @line: (type index) (default -1)
* @flags: (default 0) * @flags: (default 0)
*
* Returns: (transfer full)
**/ **/
MooOpenInfo * MooOpenInfo *
moo_open_info_new_file (GFile *file, moo_open_info_new_file (GFile *file,

18
moo/mooedit/mooeditor.c
View File

@ -1160,6 +1160,7 @@ moo_editor_load_file (MooEditor *editor,
if (new_object) if (new_object)
g_object_unref (doc); g_object_unref (doc);
g_free (filename);
g_free (uri); g_free (uri);
return success ? doc : NULL; return success ? doc : NULL;
} }
@ -2460,7 +2461,8 @@ moo_editor_reload (MooEditor *editor,
guint i; guint i;
GError *error_here = NULL; GError *error_here = NULL;
MooEditView *active_view; MooEditView *active_view;
MooEditViewArray *views; MooEditViewArray *views = NULL;
gboolean ret = FALSE;
moo_return_error_if_fail (MOO_IS_EDITOR (editor)); moo_return_error_if_fail (MOO_IS_EDITOR (editor));
@ -2470,7 +2472,7 @@ moo_editor_reload (MooEditor *editor,
MOO_EDIT_RELOAD_ERROR, MOO_EDIT_RELOAD_ERROR,
MOO_EDIT_RELOAD_ERROR_BUSY, MOO_EDIT_RELOAD_ERROR_BUSY,
"document is busy"); "document is busy");
return FALSE; goto out;
} }
if (moo_edit_is_untitled (doc)) if (moo_edit_is_untitled (doc))
@ -2479,7 +2481,7 @@ moo_editor_reload (MooEditor *editor,
MOO_EDIT_RELOAD_ERROR, MOO_EDIT_RELOAD_ERROR,
MOO_EDIT_RELOAD_ERROR_UNTITLED, MOO_EDIT_RELOAD_ERROR_UNTITLED,
"document is untitled"); "document is untitled");
return FALSE; goto out;
} }
if (!is_embedded (editor) && if (!is_embedded (editor) &&
@ -2491,7 +2493,7 @@ moo_editor_reload (MooEditor *editor,
MOO_EDIT_RELOAD_ERROR, MOO_EDIT_RELOAD_ERROR,
MOO_EDIT_RELOAD_ERROR_CANCELLED, MOO_EDIT_RELOAD_ERROR_CANCELLED,
"cancelled by user"); "cancelled by user");
return FALSE; goto out;
} }
views = moo_edit_get_views (doc); views = moo_edit_get_views (doc);
@ -2531,7 +2533,7 @@ moo_editor_reload (MooEditor *editor,
moo_text_view_undo (MOO_TEXT_VIEW (active_view)); moo_text_view_undo (MOO_TEXT_VIEW (active_view));
g_object_set_data (G_OBJECT (doc), "moo-scroll-to", NULL); g_object_set_data (G_OBJECT (doc), "moo-scroll-to", NULL);
return FALSE; goto out;
} }
for (i = 0; i < moo_edit_view_array_get_size (views); ++i) for (i = 0; i < moo_edit_view_array_get_size (views); ++i)
@ -2546,7 +2548,11 @@ moo_editor_reload (MooEditor *editor,
cursor_offset, TRUE, TRUE); cursor_offset, TRUE, TRUE);
} }
return TRUE; ret = TRUE;
out:
moo_edit_view_array_free (views);
return ret;
} }

1
moo/moolua/moolua-tests.cpp
View File

@ -137,5 +137,6 @@ moo_test_lua (MooTestOptions opts)
continue; continue;
test_name = g_strndup (basename + strlen ("test"), strlen (basename) - strlen ("test") - strlen (".lua")); test_name = g_strndup (basename + strlen ("test"), strlen (basename) - strlen ("test") - strlen (".lua"));
moo_test_suite_add_test (suite, test_name, basename, test_func, (char*) basename); moo_test_suite_add_test (suite, test_name, basename, test_func, (char*) basename);
g_free (test_name);
} }
} }