diff options
Diffstat (limited to 'src/vcl')
| -rw-r--r-- | src/vcl/ldp.c | 6 | ||||
| -rw-r--r-- | src/vcl/vcl_locked.c | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/vcl/ldp.c b/src/vcl/ldp.c index e0fb93534e9..2468bcc4750 100644 --- a/src/vcl/ldp.c +++ b/src/vcl/ldp.c @@ -646,6 +646,9 @@ ldp_select_libc_map_merge (clib_bitmap_t * result, fd_set * __restrict libcb) { uword fd; + if (!libcb) + return; + /* *INDENT-OFF* */ clib_bitmap_foreach (fd, result, ({ FD_SET ((int)fd, libcb); @@ -728,7 +731,8 @@ ldp_pselect (int nfds, fd_set * __restrict readfds, goto done; } - libc_tspec = si_bits ? libc_tspec : *timeout; + if (!si_bits) + libc_tspec = timeout ? *timeout : libc_tspec; do { diff --git a/src/vcl/vcl_locked.c b/src/vcl/vcl_locked.c index f5892c17e73..725f1bf91c0 100644 --- a/src/vcl/vcl_locked.c +++ b/src/vcl/vcl_locked.c @@ -435,6 +435,7 @@ vls_mt_acq_locks (vcl_locked_session_t * vls, vls_mt_ops_t op, int *locks_acq) } break; case VLS_MT_OP_WRITE: + ASSERT (s); if (!is_nonblk) is_nonblk = vcl_session_write_ready (s) != 0; if (!is_nonblk) |