From 39440346cf2d5055204625fe4f2950d66819a136 Mon Sep 17 00:00:00 2001 From: Jason Leach Date: Mon, 9 Jul 2001 21:54:53 +0000 Subject: It's very possible that get_storage_set_path_from_uri() returns NULL (5 of 2001-07-09 Jason Leach * e-shell-view.c (updated_folder_cb): It's very possible that get_storage_set_path_from_uri() returns NULL (5 of the 6 return cases), so check that it's not NULL before trying to strcmp() it. Fixes a startup crash. svn path=/trunk/; revision=10935 --- shell/ChangeLog | 7 +++++++ shell/e-shell-view.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index f5dbae568a..e850d23f6b 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2001-07-09 Jason Leach + + * e-shell-view.c (updated_folder_cb): It's very possible that + get_storage_set_path_from_uri() returns NULL (5 of the 6 return + cases), so check that it's not NULL before trying to strcmp() it. + Fixes a startup crash. + 2001-07-06 Dan Winship * e-shortcuts.c (shortcut_item_update): Return a gboolean saying diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index c8385ebbc4..7718f471ab 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -1136,7 +1136,7 @@ updated_folder_cb (EStorageSet *storage_set, #endif view_path = get_storage_set_path_from_uri (priv->uri); - if (strcmp (path, view_path) != 0) + if (view_path && strcmp (path, view_path) != 0) return; /* Update the folder title bar and the window title bar */ -- cgit v1.2.3