rpms/mtools/devel mtools-memset.patch, NONE, 1.1 mtools.spec, 1.15, 1.16

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Mar 21 11:28:20 UTC 2005


Update of /cvs/dist/rpms/mtools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21954

Modified Files:
	mtools.spec 
Added Files:
	mtools-memset.patch 
Log Message:
* Mon Mar 21 2005 Tim Waugh <twaugh at redhat.com>
- Fixed memset() usage bug.


mtools-memset.patch:
 fat.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE mtools-memset.patch ---
--- mtools-3.9.9/fat.c.memset	2005-03-21 11:23:10.000000000 +0000
+++ mtools-3.9.9/fat.c	2005-03-21 11:23:36.000000000 +0000
@@ -437,8 +437,8 @@
 		InfoSector_t *infoSector;
 		infoSector = (InfoSector_t *) safe_malloc(This->sector_size);
 		set_dword(infoSector->signature1, INFOSECT_SIGNATURE1);
-		memset(infoSector->filler1, sizeof(infoSector->filler1),0);
-		memset(infoSector->filler2, sizeof(infoSector->filler2),0);
+		memset(infoSector->filler1, 0, sizeof(infoSector->filler1));
+		memset(infoSector->filler2, 0, sizeof(infoSector->filler2));
 		set_dword(infoSector->signature2, INFOSECT_SIGNATURE2);
 		set_dword(infoSector->pos, This->last);
 		set_dword(infoSector->count, This->freeSpace);


Index: mtools.spec
===================================================================
RCS file: /cvs/dist/rpms/mtools/devel/mtools.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mtools.spec	15 Mar 2005 11:32:02 -0000	1.15
+++ mtools.spec	21 Mar 2005 11:28:18 -0000	1.16
@@ -13,6 +13,7 @@
 Patch3: mtools-3.9.7-bigdisk.patch
 Patch4: mtools-3.9.9-noargs.patch
 Patch5: mtools-3.9.9-badc.patch
+Patch6: mtools-memset.patch
 Prereq: /sbin/install-info
 
 BuildRequires: texinfo
@@ -33,6 +34,7 @@
 %patch3 -p1 -b .big
 %patch4 -p1 -b .noargs
 %patch5 -p1 -b .badc
+%patch6 -p1 -b .memset
 
 %build
 %configure
@@ -68,6 +70,9 @@
 %{_infodir}/*
 
 %changelog
+* Mon Mar 21 2005 Tim Waugh <twaugh at redhat.com>
+- Fixed memset() usage bug.
+
 * Tue Mar 15 2005 Tim Waugh <twaugh at redhat.com> 3.9.9-12
 - Fix build (bug #151135).
 




More information about the fedora-cvs-commits mailing list