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

Do some NULL checking on the url before using it.

Browse Source 
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.

svn path=/trunk/; revision=15473
This commit is contained in:
Jeffrey Stedfast
2002-01-25 19:08:00 +00:00
committed by Jeffrey Stedfast
parent f1a90dc6db
commit 91dd1d75d7
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mail/ChangeLog
View File

@ -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> 2002-01-24 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am: s/MAILER_CFLAGS/EVOLUTION_MAIL_CFLAGS/, * Makefile.am: s/MAILER_CFLAGS/EVOLUTION_MAIL_CFLAGS/,

5
mail/component-factory.c
View File

@ -470,7 +470,7 @@ destination_folder_handle_motion (EvolutionShellComponentDndDestinationFolder *f
CamelURL *url; CamelURL *url;
url = camel_url_new (physical_uri, NULL); 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")) if (noselect && !g_strcasecmp (noselect, "yes"))
/* uh, no way to say "illegal" */ /* uh, no way to say "illegal" */
@ -478,6 +478,7 @@ destination_folder_handle_motion (EvolutionShellComponentDndDestinationFolder *f
else else
*suggested_action_return = GNOME_Evolution_ShellComponentDnd_ACTION_MOVE; *suggested_action_return = GNOME_Evolution_ShellComponentDnd_ACTION_MOVE;
if (url)
camel_url_free (url); camel_url_free (url);
return TRUE; return TRUE;
@ -549,6 +550,8 @@ destination_folder_handle_drop (EvolutionShellComponentDndDestinationFolder *des
camel_url_free (uri); camel_url_free (uri);
return FALSE; return FALSE;
} }
if (uri)
camel_url_free (uri); camel_url_free (uri);
g_print ("in destination_folder_handle_drop (%s)\n", physical_uri); g_print ("in destination_folder_handle_drop (%s)\n", physical_uri);