diff options
| author | Denis Ovsienko <infrastation@yandex.ru> | 2011-12-18 15:40:17 +0400 |
|---|---|---|
| committer | Denis Ovsienko <infrastation@yandex.ru> | 2012-01-02 17:27:44 +0400 |
| commit | 7eed92b9653b09f064e827e887c29ee11122b4fe (patch) | |
| tree | 967341976629f684906b35f79ae96d7855ef4b0a | |
| parent | 45b341f72df6d7dd89133dfd21f43cf1cca74ce5 (diff) | |
lib: address type-punned pointers in prefix_same()
IPV4_ADDR_SAME() wasn't passed the right union member, this could cause
a bug due to strict-aliasing. IPV6_ADDR_SAME() case got its fix before
the error could be created by macro upgrade.
| -rw-r--r-- | lib/prefix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/prefix.c b/lib/prefix.c index 23202b62..ceda08de 100644 --- a/lib/prefix.c +++ b/lib/prefix.c @@ -2411,11 +2411,11 @@ prefix_same (const struct prefix *p1, const struct prefix *p2) if (p1->family == p2->family && p1->prefixlen == p2->prefixlen) { if (p1->family == AF_INET) - if (IPV4_ADDR_SAME (&p1->u.prefix, &p2->u.prefix)) + if (IPV4_ADDR_SAME (&p1->u.prefix4.s_addr, &p2->u.prefix4.s_addr)) return 1; #ifdef HAVE_IPV6 if (p1->family == AF_INET6 ) - if (IPV6_ADDR_SAME (&p1->u.prefix, &p2->u.prefix)) + if (IPV6_ADDR_SAME (&p1->u.prefix6.s6_addr, &p2->u.prefix6.s6_addr)) return 1; #endif /* HAVE_IPV6 */ } |