rpms/ElectricFence/devel ElectricFence-mmap-size.patch, NONE, 1.1 ElectricFence.spec, 1.17, 1.18

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Mar 16 19:03:43 UTC 2007


Author: pmachata

Update of /cvs/dist/rpms/ElectricFence/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25203

Modified Files:
	ElectricFence.spec 
Added Files:
	ElectricFence-mmap-size.patch 
Log Message:
- Remove bad cast in ElectricFence mmap (George Beshers)
- Resolves: #232695


ElectricFence-mmap-size.patch:
 page.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ElectricFence-mmap-size.patch ---
Size is, correctly, size_t and mmap, correctly, takes
size_t as the size argument; the cast to int flunks
64bit thinking.


diff -Naur ElectricFence-2.2.2/page.c ElectricFence-2.2.3/page.c
--- ElectricFence-2.2.2/page.c	2007-03-16 13:20:44.000000000 -0400
+++ ElectricFence-2.2.3/page.c	2007-03-16 13:23:28.000000000 -0400
@@ -70,7 +70,7 @@
 	 */
 	allocation = (caddr_t) mmap(
 	 startAddr
-	,(int)size
+	,size
 	,PROT_READ|PROT_WRITE
 	,MAP_PRIVATE|MAP_ANONYMOUS
 	,-1
@@ -122,7 +122,7 @@
 	 */
 	allocation = (caddr_t) mmap(
 	 startAddr
-	,(int)size
+	,size
 	,PROT_READ|PROT_WRITE
 	,MAP_PRIVATE
 	,devZeroFd


Index: ElectricFence.spec
===================================================================
RCS file: /cvs/dist/rpms/ElectricFence/devel/ElectricFence.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ElectricFence.spec	7 Feb 2007 17:22:48 -0000	1.17
+++ ElectricFence.spec	16 Mar 2007 19:03:41 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A debugger which detects memory allocation violations
 Name: ElectricFence
 Version: 2.2.2
-Release: 21
+Release: 22
 License: GPL
 Group: Development/Tools
 URL: http://perens.com/FreeSoftware/ElectricFence/
@@ -10,6 +10,7 @@
 Patch2: ElectricFence-2.1-vaarg.patch
 Patch3: ElectricFence-2.2.2-pthread.patch
 Patch4: ElectricFence-2.2.2-madvise.patch
+Patch5: ElectricFence-mmap-size.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -30,6 +31,7 @@
 %patch2 -p1 -b .vaarg
 %patch3 -p1 -b .pthread
 %patch4 -p1 -b .madvise
+%patch5 -p1
 
 %build
 make CFLAGS='${RPM_OPT_FLAGS} -DUSE_SEMAPHORE -fpic'
@@ -62,6 +64,10 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Mar 16 2007 Petr Machata <pmachata at redhat.com> - 2.2.2-22
+- Remove bad cast in ElectricFence mmap (George Beshers)
+- Resolves: #232695
+
 * Wed Feb  7 2007 Petr Machata <pmachata at redhat.com> - 2.2.2-21
 - Tidy up the specfile per rpmlint comments
 




More information about the fedora-cvs-commits mailing list