aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell-view.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-05-16 02:19:16 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-05-16 02:19:16 +0800
commitca848e5756dfd0a983f19c6ea6e6a78ad01ed7ee (patch)
tree7c7894fee5a441aed66d51c3ec05d071767f2a4a /shell/e-shell-view.c
parent1e478fe94bc167e450e494f0b8b3efa7ffef4998 (diff)
downloadgsoc2013-evolution-ca848e5756dfd0a983f19c6ea6e6a78ad01ed7ee.tar
gsoc2013-evolution-ca848e5756dfd0a983f19c6ea6e6a78ad01ed7ee.tar.gz
gsoc2013-evolution-ca848e5756dfd0a983f19c6ea6e6a78ad01ed7ee.tar.bz2
gsoc2013-evolution-ca848e5756dfd0a983f19c6ea6e6a78ad01ed7ee.tar.lz
gsoc2013-evolution-ca848e5756dfd0a983f19c6ea6e6a78ad01ed7ee.tar.xz
gsoc2013-evolution-ca848e5756dfd0a983f19c6ea6e6a78ad01ed7ee.tar.zst
gsoc2013-evolution-ca848e5756dfd0a983f19c6ea6e6a78ad01ed7ee.zip
Protect against the component name having slashes in it.
* 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
Diffstat (limited to 'shell/e-shell-view.c')
-rw-r--r--shell/e-shell-view.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index ccbcffa5ce..ba94aa0ed3 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -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;
}