rpms/iptraf/F-12 0001-fix-strcpy-overlap-memory.patch, NONE, 1.1 iptraf.spec, 1.36, 1.37

Nikola Pajkovsky npajkovs at fedoraproject.org
Mon Mar 22 09:04:04 UTC 2010


Author: npajkovs

Update of /cvs/extras/rpms/iptraf/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14632

Modified Files:
	iptraf.spec 
Added Files:
	0001-fix-strcpy-overlap-memory.patch 
Log Message:
Resolves: 539740 - does not list my nic eth0(overlap strcpy)

0001-fix-strcpy-overlap-memory.patch:
 ifaces.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-fix-strcpy-overlap-memory.patch ---
>From 74581ec4f4ebd7abf68c5ab042164dc0b77133ba Mon Sep 17 00:00:00 2001
From: Nikola Pajkovsky <npajkovs at redhat.com>
Date: Wed, 17 Mar 2010 17:24:48 +0100
Subject: [PATCH] fix strcpy overlap memory

Signed-off-by: Nikola Pajkovsky <npajkovs at redhat.com>
---
 src/ifaces.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/ifaces.c b/src/ifaces.c
index 8447f51..ecb8a2d 100644
--- a/src/ifaces.c
+++ b/src/ifaces.c
@@ -51,7 +51,7 @@ char *ltrim(char *buf)
     while ((*tmp == ' ') || (*tmp == '\t'))
         tmp++;
 
-    strcpy(buf, tmp);
+    memmove(buf, tmp, strlen(buf));
     return buf;
 }
 
-- 
1.6.6.1



Index: iptraf.spec
===================================================================
RCS file: /cvs/extras/rpms/iptraf/F-12/iptraf.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- iptraf.spec	4 Jan 2010 08:48:54 -0000	1.36
+++ iptraf.spec	22 Mar 2010 09:04:04 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: A console-based network monitoring utility
 Name: iptraf
 Version: 3.0.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Source0: ftp://iptraf.seul.org/pub/iptraf/%{name}-%{version}.tar.gz
 Source1: iptraf 
 URL: http://iptraf.seul.org
@@ -19,6 +19,7 @@ Patch11: iptraf-3.0.0-interface.patch
 Patch12: iptraf-3.0.1-ipv6.patch
 Patch13: iptraf-3.0.1-ipv6-fix.patch
 Patch14: iptraf-3.0.1-servmon-fix.patch
+Patch15: 0001-fix-strcpy-overlap-memory.patch
 License: GPLv2+
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +49,7 @@ on a wide variety of supported network c
 %patch12 -p1 -b .ipv6
 %patch13 -p1 -b .ipv6-fix
 %patch14 -p1 -b .servmon-fix
+%patch15 -p1 -b .fix-strcpy-overlap-memory
 %patch0 -p1 -b .Makefile
 %patch1 -p1 -b .install
 %patch2 -p1 -b .doc
@@ -100,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %attr(644,root,root) %config(noreplace) /etc/logrotate.d/iptraf
 
 %changelog
+* Wed Mar 17 2010 Nikola Pajkovsky <npajkovs at redhat.com> - 3.0.1-10
+- Resolves: 539740 - does not list my nic eth0(overlap strcpy)
+
 * Mon Jan 4 2010 Nikola Pajkovsky <npajkovs at redhat.com> - 3.0.1-9
 - Resolves: #549745 - "iptraf -s lo" makes iptraf crash
 



More information about the scm-commits mailing list