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

Protect against the component name having slashes in it.

Browse Source 
* e-shell.c (parse_default_uri): Protect against the component
name having slashes in it.

* e-shell-view.c (display_uri): Protect against invalid "default:"
URIs.  [#43079]

svn path=/trunk/; revision=21194
This commit is contained in:
Ettore Perazzoli
2003-05-15 18:19:16 +00:00
parent 1e478fe94b
commit ca848e5756
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shell/ChangeLog
View File

@ -1,3 +1,11 @@
2003-05-15 Ettore Perazzoli <ettore@ximian.com>
* e-shell.c (parse_default_uri): Protect against the component
name having slashes in it.
* e-shell-view.c (display_uri): Protect against invalid "default:"
URIs. [#43079]
2003-05-15 Rodrigo Moya <rodrigo@ximian.com>
* main.c: #ifdef'ed wombat killing code, depending on whether

7
shell/e-shell-view.c
View File

@ -2448,7 +2448,7 @@ display_uri (EShellView *shell_view,
View *view;
gboolean retval;
const char *view_info;
char *real_uri;
char *real_uri = NULL;
char *allocated_uri = NULL;
priv = shell_view->priv;
@ -2476,6 +2476,11 @@ display_uri (EShellView *shell_view,
if (strncmp (uri, E_SHELL_DEFAULTURI_PREFIX, E_SHELL_DEFAULTURI_PREFIX_LEN) == 0) {
allocated_uri = evolution_uri_for_default_uri (e_shell_view_get_shell (shell_view), uri);
if (allocated_uri == NULL) {
retval = FALSE;
goto end;
}
uri = allocated_uri;
}

5
shell/e-shell.c
View File

@ -2167,6 +2167,11 @@ parse_default_uri (EShell *shell,
else
component = g_strndup (component_start, p - component_start);
if (strchr (component, '/') != NULL) {
g_free (component);
return FALSE;
}
client = gconf_client_get_default ();
config_path = g_strdup_printf ("/apps/evolution/shell/default_folders/%s_path", component);