diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/component-factory.c | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 72301c1d74..f37fa60ca4 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2002-01-25 Jeffrey Stedfast <fejj@ximian.com> + + * component-factory.c (destination_folder_handle_motion): Do some + NULL checking on the url before using it. + (destination_folder_handle_drop): Make sure the uri is non-NULL + before freeing. + 2002-01-24 Ettore Perazzoli <ettore@ximian.com> * Makefile.am: s/MAILER_CFLAGS/EVOLUTION_MAIL_CFLAGS/, diff --git a/mail/component-factory.c b/mail/component-factory.c index 801e6f2971..cfd4478875 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -470,7 +470,7 @@ destination_folder_handle_motion (EvolutionShellComponentDndDestinationFolder *f CamelURL *url; url = camel_url_new (physical_uri, NULL); - noselect = camel_url_get_param (url, "noselect"); + noselect = url ? camel_url_get_param (url, "noselect") : NULL; if (noselect && !g_strcasecmp (noselect, "yes")) /* uh, no way to say "illegal" */ @@ -478,7 +478,8 @@ destination_folder_handle_motion (EvolutionShellComponentDndDestinationFolder *f else *suggested_action_return = GNOME_Evolution_ShellComponentDnd_ACTION_MOVE; - camel_url_free (url); + if (url) + camel_url_free (url); return TRUE; } @@ -549,7 +550,9 @@ destination_folder_handle_drop (EvolutionShellComponentDndDestinationFolder *des camel_url_free (uri); return FALSE; } - camel_url_free (uri); + + if (uri) + camel_url_free (uri); g_print ("in destination_folder_handle_drop (%s)\n", physical_uri); |