diff -u gnome-vfs2-2.14.1/debian/changelog gnome-vfs2-2.14.1/debian/changelog --- gnome-vfs2-2.14.1/debian/changelog +++ gnome-vfs2-2.14.1/debian/changelog @@ -1,3 +1,10 @@ +gnome-vfs2 (2.14.1-0ubuntu7) dapper; urgency=low + + * debian/patches/10_sftp_status_fix.patch + - fix "Protocol Error" due to incorrect error checking (Ubuntu: #39024) + + -- Ryan Lortie Thu, 18 May 2006 13:26:59 -0400 + gnome-vfs2 (2.14.1-0ubuntu6) dapper; urgency=low * debian/patches/97_from_cvs_unaliase_mimetype.patch: only in patch2: unchanged: --- gnome-vfs2-2.14.1.orig/debian/patches/10_sftp_status_fix.patch +++ gnome-vfs2-2.14.1/debian/patches/10_sftp_status_fix.patch @@ -0,0 +1,28 @@ +diff -urp gnome-vfs2-2.14.1/modules/sftp-method.c gnome-vfs2-2.14.1+/modules/sftp-method.c +--- gnome-vfs2-2.14.1/modules/sftp-method.c 2006-03-27 03:59:07.000000000 -0500 ++++ gnome-vfs2-2.14.1+/modules/sftp-method.c 2006-05-18 13:17:20.000000000 -0400 +@@ -727,17 +728,19 @@ iobuf_read_file_info (int fd, GnomeVFSFi + type = buffer_read_gchar (&msg); + id = buffer_read_gint32 (&msg); + +- if (id != expected_id || type != SSH2_FXP_ATTRS) { ++ if (id != expected_id) ++ { + buffer_free (&msg); + return GNOME_VFS_ERROR_PROTOCOL_ERROR; +- } +- else if (type == SSH2_FXP_STATUS) { ++ } else if (type == SSH2_FXP_STATUS) { + gnome_vfs_file_info_clear (info); + status = buffer_read_gint32 (&msg); + buffer_free (&msg); + return sftp_status_to_vfs_result (status); +- } +- else ++ } else if (type != SSH2_FXP_ATTRS) { ++ buffer_free (&msg); ++ return GNOME_VFS_ERROR_PROTOCOL_ERROR; ++ } else + buffer_read_file_info (&msg, info); + + buffer_free (&msg);