diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2010-03-19 09:57:45 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2010-03-19 09:57:45 +0000 |
| commit | c8077ccb26794a80b80df89223c23aa297da55fa (patch) | |
| tree | 13225df230f00de19d16ad0a8eb088a584865d57 /gnome-base/gnome-vfs/files | |
| parent | amd64 stable, bug 308379 (diff) | |
| download | historical-c8077ccb26794a80b80df89223c23aa297da55fa.tar.gz historical-c8077ccb26794a80b80df89223c23aa297da55fa.tar.bz2 historical-c8077ccb26794a80b80df89223c23aa297da55fa.zip | |
Fix bug 285706 and bug 309621
Package-Manager: portage-2.1.7.17/cvs/Linux x86_64
Diffstat (limited to 'gnome-base/gnome-vfs/files')
| -rw-r--r-- | gnome-base/gnome-vfs/files/gnome-vfs-2.24.2-symlink-crash.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.2-symlink-crash.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.2-symlink-crash.patch new file mode 100644 index 000000000000..93a6f628f6ee --- /dev/null +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.2-symlink-crash.patch @@ -0,0 +1,28 @@ +From 92869585b2e9ab4e262f1d6b7592fe7e2c3fb327 Mon Sep 17 00:00:00 2001 +From: Alexander Larsson <alexl@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 |