rpms/ntfsprogs/devel ntfsprogs-2.0.0-avoid_crash_on_failed_readall_attr.patch, NONE, 1.1 ntfsprogs-2.0.0-undelete-segfault-fix.patch, NONE, 1.1 ntfsprogs-2.0.0-build-extras-by-default.patch, 1.1, 1.2 ntfsprogs.spec, 1.15, 1.16

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/ntfsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1835

Modified Files:
	ntfsprogs-2.0.0-build-extras-by-default.patch ntfsprogs.spec 
Added Files:
	ntfsprogs-2.0.0-avoid_crash_on_failed_readall_attr.patch 
	ntfsprogs-2.0.0-undelete-segfault-fix.patch 
Log Message:
fix FTBFS, avoid crash on failed readall attr, undelete segfault fix

ntfsprogs-2.0.0-avoid_crash_on_failed_readall_attr.patch:

--- NEW FILE ntfsprogs-2.0.0-avoid_crash_on_failed_readall_attr.patch ---
diff -up ntfsprogs-2.0.0/libntfs/volume.c.BAD ntfsprogs-2.0.0/libntfs/volume.c
--- ntfsprogs-2.0.0/libntfs/volume.c.BAD	2008-09-12 12:21:01.000000000 -0400
+++ ntfsprogs-2.0.0/libntfs/volume.c	2008-09-12 12:21:40.000000000 -0400
@@ -258,8 +258,10 @@ mft_has_no_attr_list:
 	/* Receive attributes from STANDARD_INFORMATION. */
 	std_info = ntfs_attr_readall(vol->mft_ni, AT_STANDARD_INFORMATION,
 				     AT_UNNAMED, 0, NULL);
-	vol->mft_ni->flags = std_info->file_attributes;
-	free(std_info);
+	if(std_info!=NULL) {
+		vol->mft_ni->flags = std_info->file_attributes;
+		free(std_info);
+	}
 
 	/* We now have a fully setup ntfs inode for $MFT in vol->mft_ni. */
 

ntfsprogs-2.0.0-undelete-segfault-fix.patch:

--- NEW FILE ntfsprogs-2.0.0-undelete-segfault-fix.patch ---
diff -up ntfsprogs-2.0.0/ntfsprogs/ntfsundelete.c.BAD ntfsprogs-2.0.0/ntfsprogs/ntfsundelete.c
--- ntfsprogs-2.0.0/ntfsprogs/ntfsundelete.c.BAD	2008-09-12 12:19:02.000000000 -0400
+++ ntfsprogs-2.0.0/ntfsprogs/ntfsundelete.c	2008-09-12 12:19:28.000000000 -0400
@@ -1779,7 +1779,7 @@ static int undelete_file(ntfs_volume *vo
 							"%lld clusters.\n",
 							(long long)rl[i].length);
 					memset(buffer, opts.fillbyte, bufsize);
-					for (k = 0; k < rl[k].length * vol->cluster_size; k += bufsize) {
+					for (k = 0; k < rl[i].length * vol->cluster_size; k += bufsize) {
 						if (write_data(fd, buffer, bufsize) < bufsize) {
 							ntfs_log_perror("Write failed");
 							close(fd);

ntfsprogs-2.0.0-build-extras-by-default.patch:

Index: ntfsprogs-2.0.0-build-extras-by-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ntfsprogs/devel/ntfsprogs-2.0.0-build-extras-by-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntfsprogs-2.0.0-build-extras-by-default.patch	30 Nov 2007 19:36:51 -0000	1.1
+++ ntfsprogs-2.0.0-build-extras-by-default.patch	12 Sep 2008 16:32:31 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up ntfsprogs-1.13.1/ntfsprogs/Makefile.am.BAD ntfsprogs-1.13.1/ntfsprogs/Makefile.am
---- ntfsprogs-1.13.1/ntfsprogs/Makefile.am.BAD	2007-07-11 16:16:54.000000000 -0500
-+++ ntfsprogs-1.13.1/ntfsprogs/Makefile.am	2007-07-11 16:19:06.000000000 -0500
+diff -up ntfsprogs-2.0.0/ntfsprogs/Makefile.am.orig ntfsprogs-2.0.0/ntfsprogs/Makefile.am
+--- ntfsprogs-2.0.0/ntfsprogs/Makefile.am.orig	2007-09-24 12:05:58.000000000 -0400
++++ ntfsprogs-2.0.0/ntfsprogs/Makefile.am	2008-09-12 12:17:13.000000000 -0400
 @@ -11,7 +11,9 @@ endif
  # Workaround to make REALLYSTATIC work with automake 1.5.
  LINK=$(STATIC_LINK) $(LIBTOOL_LINK)
@@ -19,10 +19,10 @@
 +bin_PROGRAMS		+= ntfsdecrypt
  endif
  
- if ENABLE_RICH
-diff -up ntfsprogs-2.0.0/ntfsprogs/Makefile.in.BAD ntfsprogs-2.0.0/ntfsprogs/Makefile.in
---- ntfsprogs-2.0.0/ntfsprogs/Makefile.in.BAD	2007-11-30 08:50:49.000000000 -0500
-+++ ntfsprogs-2.0.0/ntfsprogs/Makefile.in	2007-11-30 08:51:33.000000000 -0500
+ # Set the include path.
+diff -up ntfsprogs-2.0.0/ntfsprogs/Makefile.in.orig ntfsprogs-2.0.0/ntfsprogs/Makefile.in
+--- ntfsprogs-2.0.0/ntfsprogs/Makefile.in.orig	2008-09-12 12:18:10.000000000 -0400
++++ ntfsprogs-2.0.0/ntfsprogs/Makefile.in	2008-09-12 12:15:16.000000000 -0400
 @@ -35,7 +35,9 @@ host_triplet = @host@
  target_triplet = @target@
  bin_PROGRAMS = ntfsfix$(EXEEXT) ntfsinfo$(EXEEXT) ntfscluster$(EXEEXT) \


Index: ntfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntfsprogs/devel/ntfsprogs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ntfsprogs.spec	25 Jun 2008 13:01:08 -0000	1.15
+++ ntfsprogs.spec	12 Sep 2008 16:32:31 -0000	1.16
@@ -1,11 +1,13 @@
 Name:		ntfsprogs
 Version:	2.0.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	NTFS filesystem libraries and utilities
 Source0:	http://download.sf.net/linux-ntfs/%{name}-%{version}.tar.bz2
 Patch0:		ntfsprogs-2.0.0-build-extras-by-default.patch
 Patch1:		ntfsprogs-2.0.0-mbonly-info.patch
 Patch2:		ntfsprogs-2.0.0-check_volume.patch
+Patch3:		ntfsprogs-2.0.0-undelete-segfault-fix.patch
+Patch4:		ntfsprogs-2.0.0-avoid_crash_on_failed_readall_attr.patch
 License:	GPLv2+
 URL:		http://www.linux-ntfs.org/
 Group:		System Environment/Base
@@ -46,6 +48,8 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1 -b .check_volume
+%patch3 -p1 -b .undelete-segfault-fix
+%patch4 -p1 -b .avoid_crash_on_failed_readall_attr
 
 %build
 # If we need to enable the fuse module, we'd change this.
@@ -116,6 +120,11 @@
 %{_libdir}/gnome-vfs-2.0/modules/libntfs-gnomevfs.so
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.0-9
+- avoid crash when ntfs_attr_readall fails (Christophe Grenier)
+- fix segfault in ntfsundelete (Gary Funck)
+- fix FTBFS
+
 * Wed Jun 25 2008 Tomas Mraz <tmraz at redhat.com> - 2.0.0-8
 - rebuild with new gnutls