From 12c39d549290ddf1fabca3bbb3c06d48167b633f Mon Sep 17 00:00:00 2001 From: David Hampton Date: Fri, 11 Nov 2005 15:13:18 +0000 Subject: [PATCH] Eliminate double free of memory by just freeing default_dir once at the end of the function. The gnc_extract_directory() routine will handle any intermediate freeing if called multiple times. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@11906 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 5 +++++ src/import-export/log-replay/gnc-log-replay.c | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0e0abb66d..57fbe17f99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2005-11-11 David Hampton + * src/import-export/log-replay/gnc-log-replay.c: Eliminate double + free of memory by just freeing default_dir once at the end of the + function. The gnc_extract_directory() routine will handle any + intermediate freeing if called multiple times. + * src/app-utils/file-utils.[ch]: * src/app-utils/guile-util.[ch]: * src/business/business-gnome/gnc-plugin-business.c: diff --git a/src/import-export/log-replay/gnc-log-replay.c b/src/import-export/log-replay/gnc-log-replay.c index 1620074598..421ebab0d1 100644 --- a/src/import-export/log-replay/gnc-log-replay.c +++ b/src/import-export/log-replay/gnc-log-replay.c @@ -514,14 +514,12 @@ void gnc_file_log_replay (void) NULL, default_dir, GNC_FILE_DIALOG_OPEN); - g_free(default_dir); if(selected_filename!=NULL) { /* Remember the directory as the default. */ gnc_extract_directory(&default_dir, selected_filename); gnc_gconf_set_string(GCONF_SECTION, KEY_LAST_PATH, default_dir, NULL); - g_free(default_dir); /*strncpy(file,selected_filename, 255);*/ DEBUG("Filename found: %s",selected_filename); @@ -562,7 +560,7 @@ void gnc_file_log_replay (void) } g_free(selected_filename); } - + g_free(default_dir); }