aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/vcl/ldp.c6
-rw-r--r--src/vcl/vcl_locked.c1
-rw-r--r--src/vnet/session-apps/http_server.c2
3 files changed, 7 insertions, 2 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)
diff --git a/src/vnet/session-apps/http_server.c b/src/vnet/session-apps/http_server.c
index 9df27fac0b0..2dfb6a485b8 100644
--- a/src/vnet/session-apps/http_server.c
+++ b/src/vnet/session-apps/http_server.c
@@ -570,7 +570,7 @@ close_session:
return 0;
postpone:
- svm_fifo_set_event (hs->rx_fifo);
+ (void) svm_fifo_set_event (hs->rx_fifo);
session_send_io_evt_to_thread (hs->rx_fifo, FIFO_EVENT_BUILTIN_RX);
return 0;