Merge pull request #2410 from pacovn/Coverity_1448806_Out-of-bounds_access

lib: Out-of-bounds access (Coverity 1448806, 1448810)
This commit is contained in:
Rafael Zalamena 2018-06-14 10:29:35 -03:00 committed by GitHub
commit ff456781b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -584,8 +584,8 @@ int prefix_match(const struct prefix *n, const struct prefix *p)
} }
/* Set both prefix's head pointer. */ /* Set both prefix's head pointer. */
np = (const uint8_t *)&n->u.prefix; np = n->u.val;
pp = (const uint8_t *)&p->u.prefix; pp = p->u.val;
offset = n->prefixlen / PNBBY; offset = n->prefixlen / PNBBY;
shift = n->prefixlen % PNBBY; shift = n->prefixlen % PNBBY;
@ -609,8 +609,8 @@ int prefix_match_network_statement(const struct prefix *n,
const uint8_t *np, *pp; const uint8_t *np, *pp;
/* Set both prefix's head pointer. */ /* Set both prefix's head pointer. */
np = (const uint8_t *)&n->u.prefix; np = n->u.val;
pp = (const uint8_t *)&p->u.prefix; pp = p->u.val;
offset = n->prefixlen / PNBBY; offset = n->prefixlen / PNBBY;
shift = n->prefixlen % PNBBY; shift = n->prefixlen % PNBBY;
@ -742,8 +742,8 @@ int prefix_cmp(const struct prefix *p1, const struct prefix *p2)
return 1; return 1;
return 0; return 0;
} }
pp1 = (const uint8_t *)&p1->u.prefix; pp1 = p1->u.val;
pp2 = (const uint8_t *)&p2->u.prefix; pp2 = p2->u.val;
if (p1->prefixlen != p2->prefixlen) if (p1->prefixlen != p2->prefixlen)
return 1; return 1;
@ -774,8 +774,8 @@ int prefix_common_bits(const struct prefix *p1, const struct prefix *p2)
uint8_t xor ; uint8_t xor ;
/* Set both prefix's head pointer. */ /* Set both prefix's head pointer. */
const uint8_t *pp1 = (const uint8_t *)&p1->u.prefix; const uint8_t *pp1 = p1->u.val;
const uint8_t *pp2 = (const uint8_t *)&p2->u.prefix; const uint8_t *pp2 = p2->u.val;
if (p1->family == AF_INET) if (p1->family == AF_INET)
length = IPV4_MAX_BYTELEN; length = IPV4_MAX_BYTELEN;