diff options
author | paul <paul> | 2005-06-28 17:20:26 +0000 |
---|---|---|
committer | paul <paul> | 2005-06-28 17:20:26 +0000 |
commit | ea6f82b979c21e67a8aeff17d2afaf9fda00ff9f (patch) | |
tree | c5b59c7d3095ef72880024faa837e3e433c4f84b | |
parent | a1ac18c4d5b4f8f4f279efb2ae12b46258f22282 (diff) |
2005-06-28 Paul Jakma <paul.jakma@sun.com>
* kernel_socket.c: (RTA_{ADDR,ATTR}_GET) fix mistake, NULL check
should be on DEST argument
-rw-r--r-- | zebra/ChangeLog | 5 | ||||
-rw-r--r-- | zebra/kernel_socket.c | 4 |
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; \ } |