aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorJason Leach <jleach@ximian.com>2001-07-10 05:54:53 +0800
committerJacob Leach <jleach@src.gnome.org>2001-07-10 05:54:53 +0800
commit39440346cf2d5055204625fe4f2950d66819a136 (patch)
tree2d4cb1a4e2477336ef02b4c50baf3850b5725155 /shell
parent25efa799eebf0b057a91d05a36ffadb9eeb5b9db (diff)
downloadgsoc2013-evolution-39440346cf2d5055204625fe4f2950d66819a136.tar
gsoc2013-evolution-39440346cf2d5055204625fe4f2950d66819a136.tar.gz
gsoc2013-evolution-39440346cf2d5055204625fe4f2950d66819a136.tar.bz2
gsoc2013-evolution-39440346cf2d5055204625fe4f2950d66819a136.tar.lz
gsoc2013-evolution-39440346cf2d5055204625fe4f2950d66819a136.tar.xz
gsoc2013-evolution-39440346cf2d5055204625fe4f2950d66819a136.tar.zst
gsoc2013-evolution-39440346cf2d5055204625fe4f2950d66819a136.zip
It's very possible that get_storage_set_path_from_uri() returns NULL (5 of
2001-07-09 Jason Leach <jleach@ximian.com> * 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
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/e-shell-view.c2
2 files changed, 8 insertions, 1 deletions
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 <jleach@ximian.com>
+
+ * 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 <danw@ximian.com>
* 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 */