diff -u gnome-vfs-2.24.2/debian/control gnome-vfs-2.24.2/debian/control
--- gnome-vfs-2.24.2/debian/control
+++ gnome-vfs-2.24.2/debian/control
@@ -1,7 +1,7 @@
 Source: gnome-vfs
 Section: libs
 Priority: optional
-Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Otavio Salvador <otavio@debian.org>, Sebastian Dröge <slomo@debian.org>
 Build-Depends: cdbs,
diff -u gnome-vfs-2.24.2/debian/changelog gnome-vfs-2.24.2/debian/changelog
--- gnome-vfs-2.24.2/debian/changelog
+++ gnome-vfs-2.24.2/debian/changelog
@@ -1,3 +1,11 @@
+gnome-vfs (1:2.24.2-1ubuntu2) karmic; urgency=low
+
+  * debian/patches/25_ftp_directory_read.patch: Added check that
+    the symlink_name is not NULL before calling functions on it.
+    (LP: 395835)
+
+ -- Marcin Wider <mwider@gmail.com>  Thu, 12 Nov 2009 10:02:48 +0100
+
 gnome-vfs (1:2.24.2-1ubuntu1) karmic; urgency=low
 
   * Merge from Debian unstable, remaining changes: (LP: #455076)
diff -u gnome-vfs-2.24.2/debian/control.in gnome-vfs-2.24.2/debian/control.in
--- gnome-vfs-2.24.2/debian/control.in
+++ gnome-vfs-2.24.2/debian/control.in
@@ -1,7 +1,7 @@
 Source: gnome-vfs
 Section: libs
 Priority: optional
-Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs,
diff -u gnome-vfs-2.24.2/debian/patches/series gnome-vfs-2.24.2/debian/patches/series
--- gnome-vfs-2.24.2/debian/patches/series
+++ gnome-vfs-2.24.2/debian/patches/series
@@ -1,3 +1,4 @@
+25_ftp_directory_read.patch
 01_fstab_edit_crash.patch
 02_audiocd_readonly.patch
 03_gnutls27.patch
only in patch2:
unchanged:
--- gnome-vfs-2.24.2.orig/debian/patches/25_ftp_directory_read.patch
+++ gnome-vfs-2.24.2/debian/patches/25_ftp_directory_read.patch
@@ -0,0 +1,19 @@
+Index: gnome-vfs-2.24.2/modules/ftp-method.c
+===================================================================
+--- gnome-vfs-2.24.2.orig/modules/ftp-method.c	2009-11-12 09:59:43.000000000 +0100
++++ gnome-vfs-2.24.2/modules/ftp-method.c	2009-11-12 10:01:11.000000000 +0100
+@@ -2679,8 +2679,14 @@
+ 					break;
+ 				}
+ 				
++				if (symlink_info->symlink_name == NULL) {
++					res = GNOME_VFS_ERROR_BAD_PARAMETERS;
++					break;
++		 		}
++				
+ 				symlink_name = gnome_vfs_escape_path_string (symlink_info->symlink_name);
+ 				gnome_vfs_file_info_clear (symlink_info);
++
+ 				
+ 				link_uri = gnome_vfs_uri_resolve_relative (uri, symlink_name);
+ 				g_free (symlink_name);