From 5d97d3fa515a7054558b0aa1e12593e87984ac6d Mon Sep 17 00:00:00 2001 From: Iain Holmes Date: Fri, 30 Mar 2001 22:46:53 +0000 Subject: Fix a crash when the evolution-importer-client tries to pass NULL for the folderpath. svn path=/trunk/; revision=9055 --- shell/ChangeLog | 5 +++++ shell/importer/evolution-importer-client.c | 2 ++ 2 files changed, 7 insertions(+) (limited to 'shell') 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 + + * importer/evolution-importer-client.c (evolution_importer_client_load_file): + Duplicate the folderpath, or set it to \0 + 2001-03-30 Christopher James Lahey * 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); -- cgit v1.2.3