diff options
| author | Iain Holmes <iain@src.gnome.org> | 2001-03-31 06:46:53 +0800 |
|---|---|---|
| committer | Iain Holmes <iain@src.gnome.org> | 2001-03-31 06:46:53 +0800 |
| commit | 5d97d3fa515a7054558b0aa1e12593e87984ac6d (patch) | |
| tree | 2cfd4bab93b12344b06dbcc5eb1d5cc1513db5d5 /shell | |
| parent | 4ff1d39039d52938173b2f0b956351f07bd3f84a (diff) | |
| download | gsoc2013-evolution-5d97d3fa515a7054558b0aa1e12593e87984ac6d.tar.gz gsoc2013-evolution-5d97d3fa515a7054558b0aa1e12593e87984ac6d.tar.zst gsoc2013-evolution-5d97d3fa515a7054558b0aa1e12593e87984ac6d.zip | |
Fix a crash when the evolution-importer-client tries to pass NULL for the folderpath.
svn path=/trunk/; revision=9055
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 5 | ||||
| -rw-r--r-- | shell/importer/evolution-importer-client.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 8cddf6f148..af5263c2d2 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2001-03-29 Iain Holmes <iain@ximian.com> + + * importer/evolution-importer-client.c (evolution_importer_client_load_file): + Duplicate the folderpath, or set it to \0 + 2001-03-30 Christopher James Lahey <clahey@ximian.com> * e-shell-folder-selection-dialog.c (dbl_click_cb): Since this is diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c index 34598227a1..00ec8208b9 100644 --- a/shell/importer/evolution-importer-client.c +++ b/shell/importer/evolution-importer-client.c @@ -174,6 +174,7 @@ evolution_importer_client_load_file (EvolutionImporterClient *client, const char *folderpath) { GNOME_Evolution_Importer corba_importer; + CORBA_char *folderpath_dup; gboolean result; CORBA_Environment ev; @@ -183,6 +184,7 @@ evolution_importer_client_load_file (EvolutionImporterClient *client, CORBA_exception_init (&ev); corba_importer = bonobo_object_corba_objref (BONOBO_OBJECT (client)); + folderpath_dup = CORBA_string_dup (folderpath ? folderpath : ""); result = GNOME_Evolution_Importer_loadFile (corba_importer, filename, folderpath, &ev); CORBA_exception_free (&ev); |