From: paul <paul>
Date: Wed, 22 Sep 2004 13:15:58 +0000 (+0000)
Subject: 2004-09-22 Paul Jakma <paul.jakma@sun.com>
X-Git-Tag: frr-2.0-rc1~3551
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=44983cf8a9c587dfbcad294b9dfe4dccbb68ba98;p=matthieu%2Ffrr.git

2004-09-22 Paul Jakma <paul.jakma@sun.com>

	* zserv.c: (zsend_route_multipath) fix nasty bad memset of struct
          in_addr to sizeof(struct in6_addr), causing odd and hard to debug
          crash.
---

diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index b6798077f8..275537ff47 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-22 Paul Jakma <paul.jakma@sun.com>
+
+	* zserv.c: (zsend_route_multipath) fix nasty bad memset of struct
+	  in_addr to sizeof(struct in6_addr), causing odd and hard to debug
+          crash.
+
 2004-08-31 Hasso Tepper <hasso at quagga.net>
 
 	* main.c, rt_netlink.c: Added -s command line switch for tuning
diff --git a/zebra/zserv.c b/zebra/zserv.c
index 4779b64307..96d6f533f1 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -497,7 +497,7 @@ zsend_route_multipath (int cmd, struct zserv *client, struct prefix *p,
                     || cmd == ZEBRA_IPV4_ROUTE_DELETE)
                   {
                     struct in_addr empty;
-                    memset (&empty, 0, sizeof (struct in6_addr));
+                    memset (&empty, 0, sizeof (struct in_addr));
                     stream_write (s, (u_char *) &empty, IPV4_MAX_BYTELEN);
                   }
                 else