From 2eb445e1c22e36d07e2dbfd302ff438c4190b9fe Mon Sep 17 00:00:00 2001 From: Denis Ovsienko Date: Fri, 4 Dec 2009 17:32:54 +0300 Subject: bgpd: work around warning in assegments_parse() --- bgpd/bgp_aspath.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'bgpd/bgp_aspath.c') diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c index 440815b4..3c8032f8 100644 --- a/bgpd/bgp_aspath.c +++ b/bgpd/bgp_aspath.c @@ -728,8 +728,11 @@ assegments_parse (struct stream *s, size_t length, int use32bit) if ( ((bytes + seg_size) > length) /* 1771bis 4.3b: seg length contains one or more */ || (segh.length == 0) - /* Paranoia in case someone changes type of segment length */ - || ((sizeof segh.length > 1) && (segh.length > AS_SEGMENT_MAX)) ) + /* Paranoia in case someone changes type of segment length. + * Shift both values by 0x10 to make the comparison operate + * on more, than 8 bits (otherwise it's a warning, bug #564). + */ + || ((sizeof segh.length > 1) && (0x10 + segh.length > 0x10 + AS_SEGMENT_MAX)) ) { if (head) assegment_free_all (head); -- cgit v1.2.1