HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

applied two patches from Nick Treleaven to fix invalid memory read and improve the ordering of file tabs while loading session files

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@288 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2006-04-29 18:15:37 +00:00
parent 9401f5e836
commit edf31c582c
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/callbacks.c
View File

@ -145,8 +145,8 @@ gint destroyapp(GtkWidget *widget, gpointer gdata)
gtk_widget_destroy(app->default_tag_tree); gtk_widget_destroy(app->default_tag_tree);
} }
scintilla_release_resources(); scintilla_release_resources();
if (app->have_vte) vte_close();
gtk_widget_destroy(app->window); gtk_widget_destroy(app->window);
// kill explicitly since only one or none menu is shown at a time
// destroy popup menus // destroy popup menus
if (app->popup_menu && GTK_IS_WIDGET(app->popup_menu)) if (app->popup_menu && GTK_IS_WIDGET(app->popup_menu))
@ -164,8 +164,6 @@ gint destroyapp(GtkWidget *widget, gpointer gdata)
if (msgwindow.popup_compiler_menu && GTK_IS_WIDGET(msgwindow.popup_compiler_menu)) if (msgwindow.popup_compiler_menu && GTK_IS_WIDGET(msgwindow.popup_compiler_menu))
gtk_widget_destroy(msgwindow.popup_compiler_menu); gtk_widget_destroy(msgwindow.popup_compiler_menu);
if (app->have_vte) vte_close();
g_free(app); g_free(app);
gtk_main_quit(); gtk_main_quit();

20
src/keyfile.c
View File

@ -47,7 +47,7 @@ void configuration_save(void)
gchar *data; gchar *data;
gchar *entry = g_malloc(14); gchar *entry = g_malloc(14);
gchar *fname = g_malloc0(256); gchar *fname = g_malloc0(256);
gchar **recent_files = g_new0(gchar*, app->mru_length); gchar **recent_files = g_new0(gchar*, app->mru_length + 1);
GtkTextBuffer *buffer; GtkTextBuffer *buffer;
GtkTextIter start, end; GtkTextIter start, end;
@ -149,8 +149,9 @@ void configuration_save(void)
{ {
recent_files[i] = NULL; recent_files[i] = NULL;
} }
} }
// There is a bug in GTK2.6 g_key_file_set_string_list, we must NULL terminate.
recent_files[app->mru_length] = NULL;
g_key_file_set_string_list(config, "files", "recent_files", g_key_file_set_string_list(config, "files", "recent_files",
(const gchar**)recent_files, app->mru_length); (const gchar**)recent_files, app->mru_length);
@ -368,7 +369,8 @@ gboolean configuration_open_files(void)
gchar *file, *locale_filename, **array; gchar *file, *locale_filename, **array;
gboolean ret = FALSE; gboolean ret = FALSE;
for(i = GEANY_SESSION_FILES - 1; i >= 0 ; i--) i = app->tab_order_ltr ? 0 : GEANY_SESSION_FILES - 1;
while(TRUE)
{ {
if (session_files[i] && strlen(session_files[i])) if (session_files[i] && strlen(session_files[i]))
{ {
@ -396,7 +398,6 @@ gboolean configuration_open_files(void)
locale_filename = g_locale_from_utf8(file, -1, NULL, NULL, NULL); locale_filename = g_locale_from_utf8(file, -1, NULL, NULL, NULL);
if (locale_filename == NULL) locale_filename = g_strdup(file); if (locale_filename == NULL) locale_filename = g_strdup(file);
if (g_file_test(locale_filename, G_FILE_TEST_IS_REGULAR || G_FILE_TEST_IS_SYMLINK)) if (g_file_test(locale_filename, G_FILE_TEST_IS_REGULAR || G_FILE_TEST_IS_SYMLINK))
{ {
document_open_file(-1, locale_filename, pos, FALSE, document_open_file(-1, locale_filename, pos, FALSE,
@ -406,6 +407,17 @@ gboolean configuration_open_files(void)
g_free(locale_filename); g_free(locale_filename);
} }
g_free(session_files[i]); g_free(session_files[i]);
if (app->tab_order_ltr)
{
i++;
if (i >= GEANY_SESSION_FILES) break;
}
else
{
i--;
if (i < 0) break;
}
} }
return ret; return ret;