summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--zebra/ChangeLog5
-rw-r--r--zebra/kernel_socket.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index f215266c..374f8547 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -2,9 +2,10 @@
* (global) Extern and static'ification, with related fixups
of declarations, ensuring files include their own headers, etc.
- if_ioctl.c: (interface_info_ioctl) fix obvious arg mis-order in
+ * if_ioctl.c: (interface_info_ioctl) fix obvious arg mis-order in
list loop
-
+ * kernel_socket.c: (RTA_{ADDR,ATTR}_GET) fix mistake, NULL check
+ should be on DEST argument
2005-06-14 Paul Jakma <paul.jakma@sun.com>
diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c
index d17ffe8e..a27bebde 100644
--- a/zebra/kernel_socket.c
+++ b/zebra/kernel_socket.c
@@ -81,7 +81,7 @@ extern struct zebra_t zebrad;
if ((RTMADDRS) & (RTA)) \
{ \
int len = SAROUNDUP ((PNT)); \
- if ( ((RTA) != NULL) && \
+ if ( ((DEST) != NULL) && \
af_check (((struct sockaddr *)(PNT))->sa_family)) \
memcpy ((caddr_t)(DEST), (PNT), len); \
(PNT) += len; \
@@ -90,7 +90,7 @@ extern struct zebra_t zebrad;
if ((RTMADDRS) & (RTA)) \
{ \
int len = SAROUNDUP ((PNT)); \
- if ( ((RTA) != NULL) ) \
+ if ( ((DEST) != NULL) ) \
memcpy ((caddr_t)(DEST), (PNT), len); \
(PNT) += len; \
}