summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kellner <gicmo@gnome.org>2008-02-15 19:23:38 +0000
committerChristian Kellner <gicmo@src.gnome.org>2008-02-15 19:23:38 +0000
commitdca409753b1fa2d40648e873238df40c03a9e350 (patch)
treecd62d35ea794069d614f507e0393aec742e42c25
parente285bd829a73ea05a5d3691279e82cc46c65081e (diff)
downloadgvfs-dca409753b1fa2d40648e873238df40c03a9e350.tar.gz
Fix a little crasher (NULL terminate g_build_filename) that was introduced
2008-02-15 Christian Kellner <gicmo@gnome.org> * daemon/gvfsjobenumerate.c: Fix a little crasher (NULL terminate g_build_filename) that was introduced by the optional uri addition chate to enumerate. svn path=/trunk/; revision=1280
-rw-r--r--ChangeLog6
-rw-r--r--daemon/gvfsjobenumerate.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f1dc39fa..6bf67159 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-02-15 Christian Kellner <gicmo@gnome.org>
+ * daemon/gvfsjobenumerate.c:
+ Fix a little crasher (NULL terminate g_build_filename) that
+ was introduced by the optional uri addition chate to enumerate.
+
+2008-02-15 Christian Kellner <gicmo@gnome.org>
+
* daemon/gvfsbackenddav.c:
Completly redo Multistatus parsing.
diff --git a/daemon/gvfsjobenumerate.c b/daemon/gvfsjobenumerate.c
index edec81c8..ecdb903b 100644
--- a/daemon/gvfsjobenumerate.c
+++ b/daemon/gvfsjobenumerate.c
@@ -186,7 +186,7 @@ g_vfs_job_enumerate_add_info (GVfsJobEnumerate *job,
escaped_name = g_uri_escape_string (g_file_info_get_name (info),
G_URI_RESERVED_CHARS_ALLOWED_IN_PATH,
FALSE);
- uri = g_build_filename (job->uri, escaped_name);
+ uri = g_build_filename (job->uri, escaped_name, NULL);
g_free (escaped_name);
}