callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't xmlFree (name) until after we've g_strdup'd it.

Browse Source 
2003-09-23  Jeffrey Stedfast  <fejj@ximian.com>

	* evolution-mbox-upgrade.c (get_local_store): Don't xmlFree (name)
	until after we've g_strdup'd it.

svn path=/trunk/; revision=22676
This commit is contained in:
Jeffrey Stedfast
2003-09-23 20:32:07 +00:00
committed by Jeffrey Stedfast
parent 8db4001828
commit c948d14546
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mail/ChangeLog
View File

@ -1,5 +1,8 @@
2003-09-23 Jeffrey Stedfast <fejj@ximian.com> 2003-09-23 Jeffrey Stedfast <fejj@ximian.com>
* evolution-mbox-upgrade.c (get_local_store): Don't xmlFree (name)
until after we've g_strdup'd it.
Fix for bug #48791 (and also fixes a FIXME) Fix for bug #48791 (and also fixes a FIXME)
* em-format.c (emf_init): Setup a gconf listener for changes to * em-format.c (emf_init): Setup a gconf listener for changes to

4
mail/evolution-mbox-upgrade.c
View File

@ -194,8 +194,6 @@ get_local_store (CamelSession *session, const char *dirname, const char *metadat
buf = g_strdup_printf ("%s:%s", protocol, dirname); buf = g_strdup_printf ("%s:%s", protocol, dirname);
xmlFree (protocol); xmlFree (protocol);
xmlFree (name);
if ((store = camel_session_get_store (session, buf, ex))) if ((store = camel_session_get_store (session, buf, ex)))
*namep = g_strdup (name); *namep = g_strdup (name);
else else
@ -259,6 +257,8 @@ em_migrate_dir (EMMigrateSession *session, const char *dirname, const char *full
return; return;
} }
g_free (name);
flags |= (index ? CAMEL_STORE_FOLDER_BODY_INDEX : 0); flags |= (index ? CAMEL_STORE_FOLDER_BODY_INDEX : 0);
if (!(new_folder = camel_store_get_folder (session->store, full_name, flags, &ex))) { if (!(new_folder = camel_store_get_folder (session->store, full_name, flags, &ex))) {
g_warning ("error creating new mbox folder `%s': %s", full_name, ex.desc); g_warning ("error creating new mbox folder `%s': %s", full_name, ex.desc);