rpms/gnome-vfs2/F-12 gnome-vfs-2.24.xx-ftp-symlink-NULL.patch, NONE, 1.1 gnome-vfs2.spec, 1.200, 1.201

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/gnome-vfs2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10639

Modified Files:
	gnome-vfs2.spec 
Added Files:
	gnome-vfs-2.24.xx-ftp-symlink-NULL.patch 
Log Message:
* Fri Mar 12 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.24.2-4
- ftp: Don't crash if we get a NULL symlink (#542006)


gnome-vfs-2.24.xx-ftp-symlink-NULL.patch:
 ftp-method.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE gnome-vfs-2.24.xx-ftp-symlink-NULL.patch ---
>From 92869585b2e9ab4e262f1d6b7592fe7e2c3fb327 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Wed, 10 Mar 2010 10:23:24 +0000
Subject: Don't crash if we get a NULL symlink

Patch from debian/ubuntu:
http://launchpadlibrarian.net/35571673/gnome-vfs_2.24.2-1ubuntu2.debdiff
---
diff --git a/modules/ftp-method.c b/modules/ftp-method.c
index c40c323..ac02b56 100644
--- a/modules/ftp-method.c
+++ b/modules/ftp-method.c
@@ -2678,7 +2678,12 @@ do_read_directory (GnomeVFSMethod *method,
 					res = GNOME_VFS_ERROR_TOO_MANY_LINKS;
 					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);
 				
--
cgit v0.8.3.1


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfs2/F-12/gnome-vfs2.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- gnome-vfs2.spec	2 Dec 2009 13:51:01 -0000	1.200
+++ gnome-vfs2.spec	12 Mar 2010 13:07:34 -0000	1.201
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.24.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+ 
@@ -89,6 +89,9 @@ Patch404: gnome-vfs-2.24.xx-utf8-mounts.
 # https://bugzilla.gnome.org/show_bug.cgi?id=435653
 Patch405: 0001-Add-default-media-application-schema.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=542006
+Patch406: gnome-vfs-2.24.xx-ftp-symlink-NULL.patch
+
 
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
@@ -145,6 +148,8 @@ shares (SMB) to applications using GNOME
 
 %patch405 -p1 -b .default-media
 
+%patch406 -p1 -b .ftp-symlink
+
 # for patch 10 and 4
 autoheader
 autoconf
@@ -266,6 +271,9 @@ fi
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Fri Mar 12 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.24.2-4
+- ftp: Don't crash if we get a NULL symlink (#542006)
+
 * Wed Dec  2 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.2-3
 - Patch security hole in embedded neon (CVE-2009-2473)