Skip to contentSkip to conversation

mrouted: fix bcopy patch oops

PATCH New Gustavo Zacarias 2 participants 2 messages May 3, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mrouted: fix bcopy patch oops

The bcopy patch just changes bcopy for memmove which is incorrect since bcopy and memmove use reversed src and dest parameters between them. Oops!

---
 package/mrouted/mrouted-3.9.4-bcopy.patch |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)
package/mrouted/mrouted-3.9.4-bcopy.patch +5 -10
index 73f8acc..ea8f6db 100644
@@ -1,17 +1,12 @@
----
- mtrace.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: mrouted-3.9.4/mtrace.c
-===================================================================
---- mrouted-3.9.4.orig/mtrace.c
-+++ mrouted-3.9.4/mtrace.c
+diff -Nura mrouted-3.9.4/mtrace.c mrouted-3.9.4-memmove/mtrace.c
+--- mrouted-3.9.4/mtrace.c	2010-11-19 20:53:19.000000000 -0300
++++ mrouted-3.9.4-memmove/mtrace.c	2012-05-03 08:27:33.895422455 -0300
 @@ -556,7 +556,7 @@
  		save->rtime = ((tr.tv_sec + JAN_1970) << 16) +
  		    (tr.tv_usec << 10) / 15625;
  		save->len = len;
 -		bcopy((char *)igmp, (char *)&save->igmp, ipdatalen);
-+		memmove((char *)igmp, (char *)&save->igmp, ipdatalen);
++		memmove((char *)&save->igmp, (char *)igmp, ipdatalen);
  	    }
  	    return recvlen;
  	}
@@ -20,7 +15,7 @@ Index: mrouted-3.9.4/mtrace.c
  	    (tr.tv_usec << 10) / 15625;
  	base.len = len;
 -	bcopy((char *)igmp, (char *)&base.igmp, ipdatalen);
-+	memmove((char *)igmp, (char *)&base.igmp, ipdatalen);
++	memmove((char *)&base.igmp, (char *)igmp, ipdatalen);
  	/*
  	 * If the user specified which traces to monitor,
  	 * only accept traces that correspond to the
Signature · 1 line
1.7.3.4
#1 lore raw

PATCH 1/1 mrouted: fix bcopy patch oops

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> The bcopy patch just changes bcopy for memmove which is Gustavo> incorrect since bcopy and memmove use reversed src and dest Gustavo> parameters between them. Oops!

Oops indeed. Seems to have been introduced with the 3.9.4 bump.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard