[maemo-commits] [maemo-commits] r17977 - in projects/haf/trunk/osso-gnome-vfs2/debian: . patches

[From: subversion at stage.maemo.org]

Author: richard
Date: 2009-04-02 11:52:39 +0300 (Thu, 02 Apr 2009)
New Revision: 17977

Added:
   projects/haf/trunk/osso-gnome-vfs2/debian/patches/50-NB106000-ftp-crash-symlink.patch
Modified:
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
Log:
NB#106000, SIGSEGV in do_read_directory


Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2009-04-02 07:28:21 UTC (rev 17976)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2009-04-02 08:52:39 UTC (rev 17977)
@@ -1,3 +1,9 @@
+osso-gnome-vfs2 (2.16.3-2osso3) unstable; urgency=low
+
+  * Fixes: NB#106000, SIGSEGV in do_read_directory
+
+ -- Richard Hult <richard at imendio.com>  Thu,  2 Apr 2009 09:50:00 +0200
+
 osso-gnome-vfs2 (2.16.3-2osso2) unstable; urgency=low
 
   * No change in this version, just bump the version to get reuilt

Added: projects/haf/trunk/osso-gnome-vfs2/debian/patches/50-NB106000-ftp-crash-symlink.patch
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/patches/50-NB106000-ftp-crash-symlink.patch	2009-04-02 07:28:21 UTC (rev 17976)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/patches/50-NB106000-ftp-crash-symlink.patch	2009-04-02 08:52:39 UTC (rev 17977)
@@ -0,0 +1,14 @@
+Index: modules/ftp-method.c
+===================================================================
+--- modules/ftp-method.c	(revision 15879)
++++ modules/ftp-method.c	(arbetskopia)
+@@ -2664,7 +2664,8 @@ do_read_directory (GnomeVFSMethod *metho
+ 		file_info->valid_fields &= ~GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS;
+ 
+ 		if (handle->file_info_options & GNOME_VFS_FILE_INFO_FOLLOW_LINKS &&
+-		    file_info->type == GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK) {
++		    file_info->type == GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK &&
++                    file_info->symlink_name != NULL) {
+ 			GnomeVFSURI *uri;
+ 			GnomeVFSFileInfo *symlink_info;
+ 			GnomeVFSResult res;