summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2009-12-01 11:15:47 +0100
committerAlexander Larsson <alexl@redhat.com>2009-12-01 11:26:50 +0100
commiteff994cc20d177113989aa3a2160a9a30b70f4bc (patch)
tree9c58ba30afe38693fc83dc33fb8163bbe308a996
parentb98c2a479110b37802bcd9c9ecd7f0298bf33c56 (diff)
downloadgvfs-eff994cc20d177113989aa3a2160a9a30b70f4bc.tar.gz
Handle error case in cache lookup correctly
If we're in error, we should return NULL, not an uninitialized info. (cherry picked from commit a17a5d9e3a13c0bf516a0955e79a1620efa00c6d)
-rw-r--r--daemon/gvfsftpdircache.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/daemon/gvfsftpdircache.c b/daemon/gvfsftpdircache.c
index e357edd7..dffebbc2 100644
--- a/daemon/gvfsftpdircache.c
+++ b/daemon/gvfsftpdircache.c
@@ -216,10 +216,10 @@ g_vfs_ftp_dir_cache_lookup_file_internal (GVfsFtpDirCache * cache,
g_vfs_ftp_dir_cache_entry_unref (entry);
}
- if (!g_vfs_ftp_task_is_in_error (task))
- info = cache->funcs->lookup_uncached (task, file);
+ if (g_vfs_ftp_task_is_in_error (task))
+ return NULL;
- return info;
+ return cache->funcs->lookup_uncached (task, file);
}
static GFileInfo *