Merge pull request #5148 from qlyoung/fix-bgp-read-assert

bgpd: move assert out of error case
This commit is contained in:
Lou Berger 2019-10-14 14:45:03 -04:00 committed by GitHub
commit ad63bc68f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -242,13 +242,13 @@ static int bgp_process_reads(struct thread *thread)
break; break;
} }
assert(ringbuf_space(peer->ibuf_work) >= BGP_MAX_PACKET_SIZE);
/* handle invalid header */ /* handle invalid header */
if (fatal) { if (fatal) {
/* wipe buffer just in case someone screwed up */ /* wipe buffer just in case someone screwed up */
ringbuf_wipe(peer->ibuf_work); ringbuf_wipe(peer->ibuf_work);
} else { } else {
assert(ringbuf_space(peer->ibuf_work) >= BGP_MAX_PACKET_SIZE);
thread_add_read(fpt->master, bgp_process_reads, peer, peer->fd, thread_add_read(fpt->master, bgp_process_reads, peer, peer->fd,
&peer->t_read); &peer->t_read);
if (added_pkt) if (added_pkt)