diff options
| author | Alexander Larsson <alexl@redhat.com> | 2009-04-02 17:04:48 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2009-04-02 17:04:48 +0000 |
| commit | 708ea5e11a1e3f905cd19d288fa96dd8ebc3e2c1 (patch) | |
| tree | 80e09bf267f02a9f2d2ca28b9987342273667bfa | |
| parent | eb6960d294a9895d157966f5deb0e7c30c8b0c4b (diff) | |
| download | gvfs-708ea5e11a1e3f905cd19d288fa96dd8ebc3e2c1.tar.gz | |
Bug 577748 – gvfsd-smb crash after unconnecting and connecting again aGVFS_1_2_1
2009-04-02 Alexander Larsson <alexl@redhat.com>
Bug 577748 – gvfsd-smb crash after unconnecting and connecting again a smb share
* daemon/gvfsbackendsmb.c (set_info_from_stat):
Don't crash if basename is NULL
svn path=/trunk/; revision=2361
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | daemon/gvfsbackendsmb.c | 6 |
2 files changed, 11 insertions, 2 deletions
@@ -1,5 +1,12 @@ 2009-04-02 Alexander Larsson <alexl@redhat.com> + Bug 577748 – gvfsd-smb crash after unconnecting and connecting again a smb share + + * daemon/gvfsbackendsmb.c (set_info_from_stat): + Don't crash if basename is NULL + +2009-04-02 Alexander Larsson <alexl@redhat.com> + * NEWS: Update for release diff --git a/daemon/gvfsbackendsmb.c b/daemon/gvfsbackendsmb.c index 877c6ad8..14a5a589 100644 --- a/daemon/gvfsbackendsmb.c +++ b/daemon/gvfsbackendsmb.c @@ -1474,15 +1474,17 @@ set_info_from_stat (GVfsBackendSmb *backend, G_FILE_ATTRIBUTE_STANDARD_ICON)) { icon = NULL; + content_type = NULL; + if (S_ISDIR(statbuf->st_mode)) { content_type = g_strdup ("inode/directory"); - if (strcmp (basename, "/") == 0) + if (basename != NULL && strcmp (basename, "/") == 0) icon = g_themed_icon_new ("folder-remote"); else icon = g_themed_icon_new ("folder"); } - else + else if (basename != NULL) { content_type = g_content_type_guess (basename, NULL, 0, NULL); if (content_type) |