- Fix bad buffer handling bug that broke ftp uploads

f38
Alexander Larsson 20 years ago
parent 6700f51203
commit 5e8ccb921c

@ -0,0 +1,19 @@
Index: libgnomevfs/gnome-vfs-socket-buffer.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-socket-buffer.c,v
retrieving revision 1.11
diff -u -p -r1.11 gnome-vfs-socket-buffer.c
--- libgnomevfs/gnome-vfs-socket-buffer.c 7 Jul 2004 15:04:30 -0000 1.11
+++ libgnomevfs/gnome-vfs-socket-buffer.c 13 Oct 2004 11:51:08 -0000
@@ -412,7 +412,10 @@ flush (GnomeVFSSocketBuffer *socket_buff
if (result != GNOME_VFS_OK) {
return result;
}
-
+
+ memmove (output_buffer->data,
+ output_buffer->data + bytes_written,
+ output_buffer->byte_count - bytes_written);
output_buffer->byte_count -= bytes_written;
}

@ -10,7 +10,7 @@
Summary: The GNOME virtual file-system libraries. Summary: The GNOME virtual file-system libraries.
Name: gnome-vfs2 Name: gnome-vfs2
Version: 2.8.2 Version: 2.8.2
Release: 1 Release: 2
License: LGPL License: LGPL
Group: System Environment/Libraries Group: System Environment/Libraries
Source: gnome-vfs-%{version}.tar.bz2 Source: gnome-vfs-%{version}.tar.bz2
@ -61,6 +61,7 @@ Patch51: desktop-file-utils-0.8-pleasecreate.patch
# send to upstream # send to upstream
Patch101: gnome-vfs-2.7.90-schema_about_for_upstream.patch Patch101: gnome-vfs-2.7.90-schema_about_for_upstream.patch
Patch102: gnome-vfs-2.8.2-bufer-fix.patch
Patch200: gnome-vfs-2.8.1-hal.patch Patch200: gnome-vfs-2.8.1-hal.patch
@ -137,6 +138,7 @@ perl -pi -e 's/favorites:\s+libvfolder-desktop.so//g' $DMC
# send to upstream # send to upstream
%patch101 -p1 -b .schema_about %patch101 -p1 -b .schema_about
%patch102 -p0 -b .buffer-fix
%patch200 -p0 -b .hal %patch200 -p0 -b .hal
%patch201 -p0 -b .console %patch201 -p0 -b .console
@ -253,6 +255,9 @@ done
%config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
%changelog %changelog
* Wed Oct 13 2004 Alexander Larsson <alexl@redhat.com> - 2.8.2-2
- Fix bad buffer handling bug that broke ftp uploads
* Mon Oct 11 2004 Alexander Larsson <alexl@redhat.com> - 2.8.2-1 * Mon Oct 11 2004 Alexander Larsson <alexl@redhat.com> - 2.8.2-1
- Update to 2.8.2 - Update to 2.8.2

Loading…
Cancel
Save